]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'ns' into unstable
authorSage Weil <sage@newdream.net>
Thu, 8 Apr 2010 23:42:15 +0000 (16:42 -0700)
committerSage Weil <sage@newdream.net>
Thu, 8 Apr 2010 23:42:15 +0000 (16:42 -0700)

Trivial merge