merge of '290a4d774320220c9ab2a3fa23f71d7277d2551f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 21:19:07 +0000 (21:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 21:19:07 +0000 (21:19 +0000)
     and '9bf79930fdbeb107188631d9e38d57f850e38c00'


Trivial merge