Merge branch 'master' into dev
Authored by: Wolf 2010-11-04
Parent(s): [c6a592][e61a61]
Child(ren): [4fd34b]