Merge branch 'testing' of github.com:ceph/ceph-client into into linux-3.8-ceph
authorAlex Elder <elder@inktank.com>
Wed, 20 Feb 2013 01:20:56 +0000 (19:20 -0600)
committerAlex Elder <elder@inktank.com>
Wed, 20 Feb 2013 01:21:08 +0000 (19:21 -0600)

Trivial merge