tree 8ec9e6a65dfa5a71f8b6c9890b71f676767d11be
parent 49f5210a0aa8d60000a91f69d7f8ad4a682cad53
author Austin Yuan <shengquan.yuan@intel.com> 1257731852 +0800
committer Austin Yuan <shengquan.yuan@intel.com> 1257731852 +0800

merge master->local-branch-testing2
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>