Merged from branch UI_seperation_II part 3
Authored by: hotzst 2009-10-01
Parent: [r2548]
Child: [r2550]