Merge remote branch 'remotes/ess/master' into essrelease

This commit is contained in:
KHobbits 2011-09-29 00:43:42 +01:00
commit 8bb50189bc