merge of 'd4c11ccced24bf281af2ed0d7b7c4d0fdd33692a'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:24:12 +0000 (21:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:24:12 +0000 (21:24 +0000)
commit478c0749f4b3acf972494510b13115d123916f92
treeeb5b9ea9109f30335fc853bedaeab31db77564ab
parent189eeba1948c7e4def33a113ceffdeb4f5567e1f
parent86e783303fbf3f9f0d95c876f31bda357ea41974
Merge ... 'd4c11ccced24bf281af2ed0d7b7c4d0fdd33692a'
     and 'fd4f8197fc893ac473a9b7436ba5268b5e0da70d'