Merge branch 'wo/landing' into dev
Authored by: Wolf 2010-10-27
Parent(s): [a6216d][a64038]
Child(ren): [d114c7]