Merge commit 'origin/tzork/vehicles'
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 21:10:42 +0000 (23:10 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 21:10:42 +0000 (23:10 +0200)

Trivial merge