Merge branch 'base'
[ghostsoverboard] / welcome
2011-06-16 rootwelcome