Merge remote branch 'origin/master'
authorJF Ding <jian-feng.ding@intel.com>
Tue, 13 Dec 2011 03:08:19 +0000 (19:08 -0800)
committerJF Ding <jian-feng.ding@intel.com>
Tue, 13 Dec 2011 03:08:19 +0000 (19:08 -0800)

Trivial merge