Merge branch 'edge' into wait4q
authorLogxen <logxen@hotmail.com>
Wed, 9 May 2012 14:34:13 +0000 (07:34 -0700)
committerLogxen <logxen@hotmail.com>
Wed, 9 May 2012 14:34:13 +0000 (07:34 -0700)

Trivial merge