Merge branch 'bug_618_fix_display_recording_indication'
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 18:20:05 +0000 (19:20 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 18:20:05 +0000 (19:20 +0100)

Trivial merge