merge of 351f471d442cbf1517f5d2327e576fad094e0712
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Dec 2005 17:28:52 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 17:28:52 +0000 (17:28 +0000)
commit1bb2e5b87e1c3b03641dfcf4d6ee90ea3db8bc49
tree40c990ed1164ba6b7c8116525d5457c10746eff7
parent7a04cb10f0bcd6779fb5141cf796059d1cd93328
parentb2d622b2a8d6d367f3a01366f1ae0bb5617f38f6
merge of 351f471d442cbf1517f5d2327e576fad094e0712
     and 41bf7eeb45e097a83eee74d76ccbe5d4d34e7b82