merge of d1b5c87dce377ea2c44f56b5dc50a30a516622d8
authorKoen Kooi <koen@openembedded.org>
Sun, 28 Aug 2005 14:37:26 +0000 (14:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 Aug 2005 14:37:26 +0000 (14:37 +0000)
     and e98e2ade5d50176ea17a627451ff8d233ac9a4ef


Trivial merge