Merge branch 'master' into mirceakitsune/power
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 21:28:57 +0000 (23:28 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 21:28:57 +0000 (23:28 +0200)

Trivial merge