Merge branch 'bugzilla-15951' into release
authorLen Brown <len.brown@intel.com>
Thu, 17 Jun 2010 16:18:30 +0000 (12:18 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 17 Jun 2010 16:18:30 +0000 (12:18 -0400)

Trivial merge