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

Trivial merge