Merge remote branch 'origin/cbrutail/trakmodelfixes'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 16 Jun 2011 15:19:15 +0000 (17:19 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 16 Jun 2011 15:19:15 +0000 (17:19 +0200)

Trivial merge