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

[Pádraig Brady]

commit 7fe547db6623265683dbf65bd1a1e40e1d8a7baf
Merge: 0fb8845 b5317a2
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 13:19:41 2013 +0100

    Merge branch 'master' into f20

 openstack-swift.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---