merge of 0e4a1c08bfbbaefe2b813f4ba08b4c186b04a484
authorKoen Kooi <koen@openembedded.org>
Sun, 6 Nov 2005 10:06:37 +0000 (10:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 6 Nov 2005 10:06:37 +0000 (10:06 +0000)
     and 21d66a92293faf76a506c7d17e3cd16e143bb401


Trivial merge