Merge branch 'master' into mirceakitsune/screen_update
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 23 Apr 2011 01:06:08 +0000 (04:06 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 23 Apr 2011 01:06:08 +0000 (04:06 +0300)

Trivial merge