]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' into rados
authorsage <sage@foil.westwood.newdream.net>
Thu, 20 Dec 2007 16:25:29 +0000 (08:25 -0800)
committersage <sage@foil.westwood.newdream.net>
Thu, 20 Dec 2007 16:25:29 +0000 (08:25 -0800)

Trivial merge