merge of fe620b82f3ed9b9828a78908bfe73a5c27ccc59d
authorKoen Kooi <koen@openembedded.org>
Tue, 16 May 2006 11:50:15 +0000 (11:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 11:50:15 +0000 (11:50 +0000)
commit807691a38f65b92267342db8ba4feac9b35d5758
tree8ac9a18a50642c2ea6351202feea1dba8543a441
parentff65a48e0ceb6c3566b4316a1c330c53260b1a81
parentc3417ffbf959b7ee896ccf704a9e72c6b5c7113f
merge of fe620b82f3ed9b9828a78908bfe73a5c27ccc59d
     and e84b72e0b67ac92d81d1f7a72737dd8286340e5d