merge of 5264149c55c2ce0175cfc150ff3379723e409b52
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 17 May 2006 10:06:45 +0000 (10:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 May 2006 10:06:45 +0000 (10:06 +0000)
     and c938b48843b6578cfa6d525614263e4262e61e7a


Trivial merge