tree 80d6c7f8e002117283dd1c1db4d3a915833652c7
parent b4de123a0bc4a3f0c90899864d51299628729952
parent 53471121a8aad3f0b590bfce7c95a1f5f52150f3
author Len Brown <len.brown@intel.com> 1205387993 -0400
committer Len Brown <len.brown@intel.com> 1205387993 -0400

Merge branches 'release' and 'doc' into release