Merge branch 'master' into mirceakitsune/new_loading_screens
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:04:01 +0000 (23:04 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:04:01 +0000 (23:04 +0300)

Trivial merge