Merge branch 'master' into devel
authorYi Yang <yi.y.yang@intel.com>
Thu, 19 May 2011 22:23:10 +0000 (06:23 +0800)
committerYi Yang <yi.y.yang@intel.com>
Thu, 19 May 2011 22:23:10 +0000 (06:23 +0800)
commit211411d7305db09c05a0f3e160aea6b53fac1c33
treeb30b72753d7e3e80e7ab4dd946f843191f5dec10
parenteb7431f17fbdaf687f0382ad50702f0d0bee6fb3
parent10c1bff6bde2cf880ec6441f9ed05e7bf25244b8
Merge branch 'master' into devel