Merge remote branch 'origin/cbrutail/trakmodelfixes'
authorJakob MG <jakob_mg@hotmail.com>
Mon, 6 Jun 2011 14:23:49 +0000 (16:23 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Mon, 6 Jun 2011 14:23:49 +0000 (16:23 +0200)

Trivial merge