tree 91841ca77a426eac7393a961fc14a95dc869a15c
parent 3b4dadf05d177289c279c50030c7c75e004952bb
parent a5032bfdd9c80e0231a6324661e123818eb46ecd
parent 34ff4dbccccce54c83b1234d39b7ad9e548a75dd
author Len Brown <len.brown@intel.com> 1238910670 -0400
committer Len Brown <len.brown@intel.com> 1238910670 -0400

Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release