merge of '4876e130f4dda342390929a72c2c452dfa33d3ac'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:24:40 +0000 (11:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:24:40 +0000 (11:24 +0000)
     and 'e0d9912acaac13bd724188fe1ad13ef35363ee75'


Trivial merge