merge of '87b49518bcc5300a395daeb3510b7801f333eda9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 12:46:33 +0000 (12:46 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 12:46:33 +0000 (12:46 +0000)
     and 'ba162bf6372784bad9177dc8a7fa8a66c9e665c4'


Trivial merge