Merge branch 'master' into mirceakitsune/sandbox
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 11:03:26 +0000 (13:03 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 15 Nov 2011 11:03:26 +0000 (13:03 +0200)

Trivial merge