merge of '028626165f94e6e0adee3c762f85ef505eeaa914'
authorJunqian Gordon Xu <xjqian@gmail.com>
Fri, 19 Sep 2008 02:34:43 +0000 (02:34 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Fri, 19 Sep 2008 02:34:43 +0000 (02:34 +0000)
     and '57913c45a2b8c01ec5a3c8f98a39b2fa258c0ffd'


Trivial merge