merge origin/develop for commit
authorroot <root@nzy.(none)>
Fri, 23 Jul 2010 09:23:35 +0000 (17:23 +0800)
committerroot <root@nzy.(none)>
Fri, 23 Jul 2010 09:23:35 +0000 (17:23 +0800)
commitc57328247eaf32f75c4408ad31f4a3c73bc7bd26
tree747ae4b5f229acdf32d7044ab6e8a39216f58dce
parent4318594d3226dbc5dfd930792cb4ae737bb86b16
parent4339a2c95b282dcf0022f4a48a496fa08c068a83
merge origin/develop for commit