Merge branch 'bug_307_fix_deepstandby_texts'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:01:07 +0000 (16:01 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:01:07 +0000 (16:01 +0100)

Trivial merge