Xinqi Bao's Git

merge with backout head
authorMatthias-Christian Ott <[email protected]>
Thu, 10 Jul 2008 20:43:24 +0000 (22:43 +0200)
committerMatthias-Christian Ott <[email protected]>
Thu, 10 Jul 2008 20:43:24 +0000 (22:43 +0200)

Trivial merge