Xinqi Bao's Git

merge lsx -> default
authorConnor Lane Smith <[email protected]>
Thu, 23 Jun 2011 19:27:28 +0000 (20:27 +0100)
committerConnor Lane Smith <[email protected]>
Thu, 23 Jun 2011 19:27:28 +0000 (20:27 +0100)

Trivial merge