Merge branch 'edge' into g92
authorLogxen <logxen@hotmail.com>
Fri, 28 Dec 2012 22:28:01 +0000 (14:28 -0800)
committerLogxen <logxen@hotmail.com>
Fri, 28 Dec 2012 22:28:01 +0000 (14:28 -0800)

Trivial merge