Merge remote branch 'origin/master'
authorJF Ding <jian-feng.ding@intel.com>
Fri, 21 Oct 2011 05:32:26 +0000 (13:32 +0800)
committerJF Ding <jian-feng.ding@intel.com>
Fri, 21 Oct 2011 05:32:26 +0000 (13:32 +0800)

Trivial merge