merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 May 2006 14:07:53 +0000 (14:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 14:07:53 +0000 (14:07 +0000)
     and b2ab0fa552043211df9ed0b809ba28541d552bec


Trivial merge