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)
commit3f24acef873cb1ab43b40fe7b2c5d6e065dd6dc5
tree2e10783d582b5db13ab71c509d51001e6f98dc6a
parent24debb675d21986fcc1faa39a3591d12d056e0cd
parent0307561c352e512a19e55d0caf2f1be5594a536d
Merge ... '028626165f94e6e0adee3c762f85ef505eeaa914'
     and '57913c45a2b8c01ec5a3c8f98a39b2fa258c0ffd'