merge of 'b9c4f1cc88011971bc5cab1439118b7e70f83ed9'
authorJunqian Gordon Xu <xjqian@gmail.com>
Sat, 15 Mar 2008 23:37:45 +0000 (23:37 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Sat, 15 Mar 2008 23:37:45 +0000 (23:37 +0000)
     and 'c841840b6b60071668006ee810bf8da6f4154973'


Trivial merge