Merge remote-tracking branch 'origin/bug_671_python_update'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:55:04 +0000 (10:55 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:55:04 +0000 (10:55 +0200)

Trivial merge