[ceph: 4/4] Merge branch 'f17'

[Jonathan Dieter]

commit b003ada4bca43fa4a0ff6e64dbba1d9026342404
Merge: 9097f5d f32a9e4
Author: Jonathan Dieter <jdieter at lesbg.com>
Date:   Tue Mar 6 17:10:38 2012 +0200

    Merge branch 'f17'
    
    Signed-off-by: Jonathan Dieter <jdieter at lesbg.com>

 .gitignore                                         |    2 +-
 ...9-comment-out-unused-code-in-dump_pop_map.patch |   33 ----------
 ceph-0.41-compile-fixes.patch                      |   67 --------------------
 ceph.spec                                          |   23 +++++---
 sources                                            |    2 +-
 5 files changed, 17 insertions(+), 110 deletions(-)
---