Merge branch 'master' into devel
authorYi Yang <yi.y.yang@intel.com>
Fri, 27 May 2011 20:54:14 +0000 (04:54 +0800)
committerYi Yang <yi.y.yang@intel.com>
Fri, 27 May 2011 20:54:14 +0000 (04:54 +0800)
commita1baa31f9a763d9296f98c84fae715cf0fc3c53f
tree770b4118e7739f93813605bd7cc3f5b59203f904
parentdc5682e9882867355938b8d32fa7e56f39139242
parentb8f0973b99ac49da3e32703b27dc90a4e776a82a
Merge branch 'master' into devel