merge of '4be62db5e8ff5d5cad0e43cd8487d753ab05b5db'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 13:28:04 +0000 (13:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 13:28:04 +0000 (13:28 +0000)
     and '9f8cf61e9a8cc62317c12ec79fb40a6685030bc3'


Trivial merge