Xinqi Bao's Git

merge lsx -> default
authorConnor Lane Smith <[email protected]>
Mon, 17 Oct 2011 09:08:04 +0000 (10:08 +0100)
committerConnor Lane Smith <[email protected]>
Mon, 17 Oct 2011 09:08:04 +0000 (10:08 +0100)

Trivial merge