This is the 3rd version. Modified against the latest trunk. Signed-off-by: alzhao<alzhao@gmail.com> SVN-Revision: 47620