]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of git://ceph.newdream.net/ceph
authorSage Weil <sage@newdream.net>
Fri, 4 Jan 2008 23:32:26 +0000 (15:32 -0800)
committerSage Weil <sage@newdream.net>
Fri, 4 Jan 2008 23:32:26 +0000 (15:32 -0800)

Trivial merge