merge of a9f324c20ac7e7ac1d2a2525d55b2e2894aac109
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Feb 2006 13:02:23 +0000 (13:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 13:02:23 +0000 (13:02 +0000)
commit0b5854143eda80a8828353fb4d95ec8491bd9413
tree2b44f712348a00b0ab02cc1e4b2cef602946d2a1
parent932b045df7054fa7796910e4683575e8d54b87dd
parent8cf4d80ef089e97b3c318109f88f44a386b1255a
merge of a9f324c20ac7e7ac1d2a2525d55b2e2894aac109
     and c945bc8161c3df7b0862623cecfd4c6d3acb7be0