merge of 84f63be2256ea962f54471dca45f06c5f0c8e922
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Jul 2005 13:18:03 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 13:18:03 +0000 (13:18 +0000)
     and 932dd96f52650232b248c21821a0e20649a5a2f8


Trivial merge