Merge remote branch 'origin/master' into 1.3.y
authorPeng Huang <shawn.p.huang@gmail.com>
Tue, 30 Mar 2010 04:49:27 +0000 (12:49 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Tue, 30 Mar 2010 04:49:27 +0000 (12:49 +0800)
commit06b8aeabdbd347396ea5526abca70229cb2a47e9
tree3b628128b26523bc01bf64fc9e2bbaf26f1549ef
parent39782a6a4ae6221868e2430d9085dacba98b8548
parent2b25925df7c193731afeb43fbee777a2fa9c2d13
Merge remote branch 'origin/master' into 1.3.y