merge of aa89decda49eb9f74b334f404fd14af6fde11da8
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Oct 2005 17:51:41 +0000 (17:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Oct 2005 17:51:41 +0000 (17:51 +0000)
     and da7858591237b184c0a172490f369d80a9b47ef8


Trivial merge