Merge branch 'master' into mirceakitsune/red_planet
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 30 Jan 2011 21:25:24 +0000 (23:25 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 30 Jan 2011 21:25:24 +0000 (23:25 +0200)

Trivial merge