Merge branch 'bugzilla-15749' into release
authorLen Brown <len.brown@intel.com>
Fri, 16 Apr 2010 20:08:07 +0000 (16:08 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 16 Apr 2010 20:08:07 +0000 (16:08 -0400)

Trivial merge