merge of '8a77047e21f2ed3e6cb19c49060c2046a1d4e4e7'
authorJunqian Gordon Xu <xjqian@gmail.com>
Fri, 23 Nov 2007 05:08:37 +0000 (05:08 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Fri, 23 Nov 2007 05:08:37 +0000 (05:08 +0000)
     and '90119a696ca4b909f2fce4c7fa0807dfd65676dc'


Trivial merge