updates for 20130426
Merge branch 'master' of https://github.com/marafa/spacewalk