merge of '02399f609ed573f10db394149ecfa4897f7ceb20'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 01:13:26 +0000 (01:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 01:13:26 +0000 (01:13 +0000)
     and '81518d02cd7b89ed3b6efad1d9e3bc7f512f6172'


Trivial merge