merge of d23fa20efa477539bb55a99c02a96896167f1c2b
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Jul 2005 21:38:58 +0000 (21:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:38:58 +0000 (21:38 +0000)
     and d974b2fdc2202ed227cf57f941cdb0b45b03cf15


Trivial merge