merge of '5b9a87ae38dcfb5f93e5ef675666514e1e0a7ed0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 09:06:56 +0000 (09:06 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 09:06:56 +0000 (09:06 +0000)
     and 'c58d6c1db9e081a653d853df73c96b63db90069a'


Trivial merge