[ceph/el6: 7/7] Merge remote-tracking branch 'origin' into el6

[Kaleb S. KEITHLEY]

commit 897c4bbb15c11c998cf180231a7e35ce9211e9c6
Merge: dc4aea2 4be65c2
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jul 4 12:56:37 2014 -0400

    Merge remote-tracking branch 'origin' into el6

 ceph-0.81.0-Makefile.in.patch       |   40 ++
 ceph-0.81.0-configure.ac.patch      |   14 +
 ceph-0.81.0-test-librbd-fsx.c.patch |   11 +
 ceph.spec                           |  748 +++++++++++++++++++++++++++--------
 4 files changed, 644 insertions(+), 169 deletions(-)
---