Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing
authorAlex Elder <elder@inktank.com>
Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)
committerAlex Elder <elder@inktank.com>
Wed, 30 Jan 2013 13:54:34 +0000 (07:54 -0600)

Trivial merge