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)
commit16719dc8ce9373ba8a671cb35b7be0a188242cc5
tree23d06f4f4a3967610ffdb2d8af5a93b3ef286aa1
parente3795cd4b62eeb7d16679e15c4bc18cd59dc3108
parent7b55212801daa04fb55d54e907232ecb33549290
Merge ... '8a77047e21f2ed3e6cb19c49060c2046a1d4e4e7'
     and '90119a696ca4b909f2fce4c7fa0807dfd65676dc'