Merge branch 'master' of git://gitorious.org/baulk/mainline
treee246922a171e7dd6074408a2539fb79ecc8a1cb3
drwxr-xr-x - pkg
drwxr-xr-x - src
drwxr-xr-x - templates