merge of '1e74f5ed8af305cb8e17fcf9acd8941acaec53d5'
authorJunqian Gordon Xu <xjqian@gmail.com>
Mon, 22 Sep 2008 14:48:25 +0000 (14:48 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Mon, 22 Sep 2008 14:48:25 +0000 (14:48 +0000)
     and '52946428eea7cbbb3e9f7d6d96641b3ed74ae8df'


Trivial merge