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

[Kaleb S. KEITHLEY]

commit 4e33e003a1c2f9a23e3c4f057d9f37bf0e592b78
Merge: bb9f0b0 f082c04
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue May 13 21:02:23 2014 -0400

    Merge remote-tracking branch 'origin' into el6

 .gitignore                 |    2 +
 ceph-fix-sbin-target.patch |   41 +++++++++++++++-----
 ceph-non-x86_64.patch      |   23 -----------
 ceph.spec                  |   89 ++++++++++++++++++++++++++++++-------------
 sources                    |    2 +-
 5 files changed, 95 insertions(+), 62 deletions(-)
---