Xinqi Bao's Git

merge
authorAnselm R Garbe <[email protected]>
Fri, 17 Jul 2009 12:35:44 +0000 (13:35 +0100)
committerAnselm R Garbe <[email protected]>
Fri, 17 Jul 2009 12:35:44 +0000 (13:35 +0100)

Trivial merge