Handle conflicts from git merge release-20160315

diff --cc debian/control
index 856566a,827c2e1..f8d1a80
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -16,8 -16,8 +16,9 @@@ Build-Depends
   python-pkg-resources,
   python-setuptools,
   sgml2x,
+  librpm-tizen,
  # For rpm (epydoc)
 + rpm-common,
   python-rpm
  Standards-Version: 3.9.4
  Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git

diff --cc gbp/scripts/buildpackage_rpm.py
Simple merge