Merge remote branch 'origin/bug_413_update_duplicate_tsid_onid_workarounds' into 2.8
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:41:35 +0000 (18:41 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 14 Apr 2010 16:41:35 +0000 (18:41 +0200)

Trivial merge