Merge branch 'ss' into edge
authorLogxen <logxen@hotmail.com>
Sun, 17 Jun 2012 19:29:34 +0000 (12:29 -0700)
committerLogxen <logxen@hotmail.com>
Sun, 17 Jun 2012 19:29:34 +0000 (12:29 -0700)

Trivial merge