Merge branch 'crosshair_bug'
authorlampehe-local <henri.lampela@ixonos.com>
Fri, 11 Jun 2010 12:54:00 +0000 (15:54 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Fri, 11 Jun 2010 12:54:00 +0000 (15:54 +0300)

Trivial merge