merge of '0f57f5bc8ead2dbd47f11f9b636930304209133f'
authorJunqian Gordon Xu <xjqian@gmail.com>
Fri, 19 Sep 2008 23:24:30 +0000 (23:24 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Fri, 19 Sep 2008 23:24:30 +0000 (23:24 +0000)
     and '3ee0a6f68b337fd507253610e831ff5b31c0bb04'


Trivial merge