Merge branch 'master' into mirceakitsune/voretemple_updates
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 6 Sep 2010 15:30:02 +0000 (18:30 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 6 Sep 2010 15:30:02 +0000 (18:30 +0300)

Trivial merge