merged Haoyu's T477 branch into mainline
authorStefan Behnel <scoder@users.berlios.de>
Fri, 1 Apr 2011 15:14:05 +0000 (17:14 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 1 Apr 2011 15:14:05 +0000 (17:14 +0200)
commitc0969f489e8c758b905d3ec5a332aff347e8a317
tree2b9acc840aa1c375f2376f3d52882dbeb8e8590d
parentdfa643cf961e192990eaa51f776641b31772e7c7
merged Haoyu's T477 branch into mainline

--HG--
extra : rebase_source : 3dd5c4c8787ab6fcc372345c336a2a69af75e21e