Merge remote-tracking branch 'origin/samual/crosshair_ring_updates'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 18:09:46 +0000 (19:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 18:09:46 +0000 (19:09 +0100)

Trivial merge