Merge branch 'bug_538_ignore_global_actions_in_standby'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:02:41 +0000 (12:02 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:02:41 +0000 (12:02 +0200)

Trivial merge