Merge branch 'edge' into rostock2
authorLogxen <logxen@hotmail.com>
Thu, 14 Feb 2013 08:31:44 +0000 (00:31 -0800)
committerLogxen <logxen@hotmail.com>
Thu, 14 Feb 2013 08:31:44 +0000 (00:31 -0800)

Trivial merge