merge of '6114e88c0acc202895c41c560c0546244d2c5227'
authorJunqian Gordon Xu <xjqian@gmail.com>
Wed, 21 Nov 2007 18:27:33 +0000 (18:27 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Wed, 21 Nov 2007 18:27:33 +0000 (18:27 +0000)
     and '90ff90e827783136b60ae8c162bf1deef26db750'


Trivial merge