merge of '19b3553f698a014d63c349b2723f835295c7b5da'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 08:16:51 +0000 (08:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 08:16:51 +0000 (08:16 +0000)
     and '38e2cd40a04ac88008e433a43002415c562145e4'


Trivial merge