Merge branches 'release' and 'dock' into release
authorLen Brown <len.brown@intel.com>
Tue, 18 Mar 2008 09:17:15 +0000 (05:17 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 18 Mar 2008 09:17:15 +0000 (05:17 -0400)

Trivial merge