Merge branch 'bug_262_no_more_ask_50hz' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 10:13:52 +0000 (11:13 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 10:13:52 +0000 (11:13 +0100)

Trivial merge