Merge branch 'para_play_fixes'
authorAndre <maan@p133.(none)>
Sat, 25 Feb 2006 09:15:54 +0000 (10:15 +0100)
committerAndre <maan@p133.(none)>
Sat, 25 Feb 2006 09:15:54 +0000 (10:15 +0100)

Trivial merge