Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release
authorLen Brown <len.brown@intel.com>
Sun, 26 Dec 2010 22:05:07 +0000 (17:05 -0500)
committerLen Brown <len.brown@intel.com>
Sun, 26 Dec 2010 22:05:07 +0000 (17:05 -0500)
commitbbbcde9d9614683fbeb41f00728cfbfb7f75a7ad
treeaa085801b7b1203c171c7f999d0a26a4105ba4ec
parentd7c1255a3a21e98bdc64df8ccf005a174d7e6289
parent5acdb1af907d5908b4942d425c0983f353dd8fc5
parentcde44d1740bcb3dcfecbf792a71826431e61686e
Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release