t d99cf9d679a520d67f81d805b7cb91c68e1847f0
author Len Brown <len.brown@intel.com> 1136583261 -0500
committer Len Brown <len.brown@intel.com> 1136583261 -0500

Auto-update from upstream