merge of e1fcdfd9f2f2a7a6141992636e1bf716a50644d3
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Jul 2005 12:46:12 +0000 (12:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 12:46:12 +0000 (12:46 +0000)
     and f73e4aeedb4ebe0d689215f48346e9c098e2adea


Trivial merge