Merge remote-tracking branch 'origin/samual/keepaway'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Feb 2011 20:29:37 +0000 (21:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Feb 2011 20:29:37 +0000 (21:29 +0100)

Trivial merge