[bzr/f19: 10/10] Merge branch 'master' into f19

[Toshio くらとみ]

commit 43289cafefeb715d74b44b6b596ba624696ab14f
Merge: dc948d4 9c2f010
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue May 28 18:01:34 2013 -0700

    Merge branch 'master' into f19
    
    Conflicts:
    	bzr.spec

 bzr-2.5b5-fix_sphinx11_texinfo.patch |   11 -------
 bzr-gpg-no-agent-error.patch         |   44 +++++++++++++++++++++++++++
 bzr.dev-5439-python27.patch          |   55 ----------------------------------
 bzr.spec                             |   12 ++++++-
 4 files changed, 54 insertions(+), 68 deletions(-)
---
diff --cc bzr.spec
index 9516ab0,c2cf1c3..587a112
--- a/bzr.spec
+++ b/bzr.spec
@@@ -150,13 -158,13 +158,13 @@@ rm -rf $RPM_BUILD_ROO
  * Tue May 28 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.5.1-11
  - BuildRequires Cython so that the C extensions are built from their original sources.
  
 -* Tue May 28 2013 Ondrej Oprala <ooprala at redhat.com 2.5.1-10
 +* Tue May 28 2013 Ondrej Oprala <ooprala at redhat.com - 2.5.1-10
  - Conditionally add -fno-strict-aliasing to CFLAGS
  
- * Tue May 28 2013 Ondrej Oprala <ooprala at redhat.com> - 2.5.1-9
 -* Tue May 28 2013 Ondrej Oprala <ooprala at redhat.com 2.5.1-9
++* Tue May 28 2013 Ondrej Oprala <ooprala at redhat.com - 2.5.1-9
  - Add gettext to BuildRequires
  
 -* Mon May 27 2013 Ondrej Oprala <ooprala at redhat.com> 2.5.1-8
 +* Mon May 27 2013 Ondrej Oprala <ooprala at redhat.com> - 2.5.1-8
  - Fix conditional include of python-paramiko
  
  * Fri May 24 2013 Ondrej Oprala <ooprala at redhat.com> - 2.5.1-7