Merge remote branch 'origin/bug_429_remove_hardcoded_paths' into bug_429_remove_hardc...
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 1 Sep 2010 13:42:29 +0000 (15:42 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 1 Sep 2010 13:42:29 +0000 (15:42 +0200)

Trivial merge