Changes since V1: I resend this patch for current trunk.The former V1 patch is for CC branch. Signed-off-by: Shonn Lu <countrysideboy@qq.com> SVN-Revision: 47617
