merge of 'e7b51cdff552f8acee23869051f6d9ddf9b5cb85'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 16:40:10 +0000 (16:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 6 Jan 2007 16:40:10 +0000 (16:40 +0000)
     and 'ff4945554f42e9be0ee0cf9d1a222718ac61d4b6'


Trivial merge