Merge remote branch 'origin/tzork/trakfix1'
authortzork <jakob_mg@hotmail.com>
Wed, 2 Feb 2011 08:15:14 +0000 (09:15 +0100)
committertzork <jakob_mg@hotmail.com>
Wed, 2 Feb 2011 08:15:14 +0000 (09:15 +0100)

Trivial merge