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)

Trivial merge