[openstack-swift/f20: 9/9] Merge branch 'master' into f20

[Pádraig Brady]

commit 27bcb2dd5f6f457ecd42db4817979170b8f0e8a1
Merge: ac3707c 448ea09
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 9 15:29:22 2013 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	openstack-swift.spec

 0001-remove-runtime-requirement-on-pbr.patch      |   29 ++++++++++++++++
 0002-Add-fixes-for-building-the-doc-package.patch |   37 +++++++++++++++++++++
 openstack-swift.spec                              |   19 ++++++++--
 3 files changed, 81 insertions(+), 4 deletions(-)
---