[ceph/el6: 2/2] Merge branch 'master' into el6

[Dan Horák]

commit a7086b93e920314d7baf7854a0da0e246f41af8c
Merge: d2d8b52 52a2b9b
Author: Dan Horák <dan at danny.cz>
Date:   Mon Oct 7 12:11:10 2013 +0200

    Merge branch 'master' into el6

 ceph-non-x86_64.patch |   23 +++++++++++++++++++++++
 ceph.spec             |    7 ++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---