merge of '0c8e229c6b28d5a860d0b3d8d71739f9c9bb18e0'
authorJunqian Gordon Xu <xjqian@gmail.com>
Mon, 26 Nov 2007 21:43:54 +0000 (21:43 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Mon, 26 Nov 2007 21:43:54 +0000 (21:43 +0000)
     and 'ed8cc53f61ab5684eccfe6a4732071def8a37424'


Trivial merge