merge of '59af9461600816295b2ae93e9b4152253f8fade0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 29 Oct 2006 13:45:28 +0000 (13:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 29 Oct 2006 13:45:28 +0000 (13:45 +0000)
     and '72528d9d61c429d9781db3e1ec1c4e90f086cf1b'


Trivial merge