Merge branch 'edge' into wait4q
authorLogxen <logxen@hotmail.com>
Wed, 9 May 2012 22:25:38 +0000 (15:25 -0700)
committerLogxen <logxen@hotmail.com>
Wed, 9 May 2012 22:25:38 +0000 (15:25 -0700)

Trivial merge