merge of '76862bf171f16f2d44c6ea1adf561172aab9a84f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 12:27:58 +0000 (12:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 12:27:58 +0000 (12:27 +0000)
     and '92202575dd71832a1a1aaef0aa25a6747117cf45'


Trivial merge