Merge branch 'bug_429_remove_hardcoded_paths' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 1 Sep 2010 13:56:06 +0000 (15:56 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 1 Sep 2010 13:56:06 +0000 (15:56 +0200)

Trivial merge