Merge branch 'master' of ssh://zarb.org/srv/git/booh
[booh] / desktop /
2008-03-21 gcsync