Merge branch 'bugzilla-13620-revert' into release
authorLen Brown <len.brown@intel.com>
Sun, 2 Aug 2009 15:31:32 +0000 (11:31 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 2 Aug 2009 15:31:32 +0000 (11:31 -0400)

Trivial merge