Merge branch 'fixes' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 Aug 2013 07:49:30 +0000 (15:49 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 Aug 2013 07:49:30 +0000 (15:49 +0800)

Trivial merge