Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable

diff --cc src/kernel/caps.c
Simple merge

diff --cc src/kernel/ceph_tools.c
Simple merge

diff --cc src/kernel/file.c
Simple merge