merge of ef62b2555a5d30ff42544ba03d38558f139601b4
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Dec 2005 13:02:34 +0000 (13:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Dec 2005 13:02:34 +0000 (13:02 +0000)
     and f329d6133a0f6951c95e2f6581c56a63a56a814b


Trivial merge