Merge remote branch 'refs/remotes/origin/fruitiex/waypoints'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 16:03:05 +0000 (18:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 16:03:05 +0000 (18:03 +0200)

Trivial merge