]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@newdream.net>
Mon, 18 Apr 2011 22:06:47 +0000 (15:06 -0700)
committerSage Weil <sage@newdream.net>
Mon, 18 Apr 2011 22:06:47 +0000 (15:06 -0700)

Trivial merge