Merge branch 'master' of ssh://git.naquadah.org/var/cache/git/awesome