add yeminfeng02 20130427
Merge remote-tracking branch 'origin/featureA'