Merge branch 'bug_246_cutlistedit'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:10:02 +0000 (16:10 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 22 Dec 2009 15:10:02 +0000 (16:10 +0100)

Trivial merge