Thu, 13 Jun 2013 22:15:32 +0800 merge
chunhan [Thu, 13 Jun 2013 22:15:32 +0800] rev 7
merge
(0) -1 +1 +10 tip