merge of '297ad7b94e8bbe83dfdc4147df98885ce3617e76'
authorJunqian Gordon Xu <xjqian@gmail.com>
Sun, 24 Feb 2008 17:55:01 +0000 (17:55 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Sun, 24 Feb 2008 17:55:01 +0000 (17:55 +0000)
     and '6678db7afc1756949a7d7e0c29814b8ba5988e74'


Trivial merge