update from 29 server
authoryxj <yxj@yxj-desktop.(none)>
Tue, 2 Aug 2011 03:59:56 +0000 (11:59 +0800)
committeryxj <yxj@yxj-desktop.(none)>
Tue, 2 Aug 2011 03:59:56 +0000 (11:59 +0800)

Trivial merge