Merge branch '2.3.0-2.testing' testkit-lite-2.0-final-version-ww19 testkit-lite-ww04release-2.3.0-2
authorTang Shaofeng <shaofeng.tang@intel.com>
Thu, 24 Jan 2013 09:48:39 +0000 (17:48 +0800)
committerTang Shaofeng <shaofeng.tang@intel.com>
Thu, 24 Jan 2013 09:48:39 +0000 (17:48 +0800)

Trivial merge