merge of '1e74f5ed8af305cb8e17fcf9acd8941acaec53d5'
authorJunqian Gordon Xu <xjqian@gmail.com>
Mon, 22 Sep 2008 14:48:25 +0000 (14:48 +0000)
committerJunqian Gordon Xu <xjqian@gmail.com>
Mon, 22 Sep 2008 14:48:25 +0000 (14:48 +0000)
commitb3b0aa0ba55f754208c1a51ba706c34f6eb6f23c
tree7fb690255c6ad866d36bbb0c51e43c64cd400b0f
parentb1851cda70581bbc0f4dd64fc253e69ee9141bdb
parentf7cd1c3c4009071cf21bf3c9a016bfe62299e49d
Merge ... '1e74f5ed8af305cb8e17fcf9acd8941acaec53d5'
     and '52946428eea7cbbb3e9f7d6d96641b3ed74ae8df'