merge of 5e488367b644497740e81d030ed34e9925440107
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Jul 2005 21:51:36 +0000 (21:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:51:36 +0000 (21:51 +0000)
     and eea3d1cfa60979c91e14fa30d7c9644d58fba40b


Trivial merge