merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 12:05:06 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:05:06 +0000 (12:05 +0000)
     and 5c447cd90d49ff7228679b71f67a78e1a48e10d7


Trivial merge