merge of '5071c48a87d5b7fe1522ead80ed52698f40d90af'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Mar 2007 10:55:38 +0000 (10:55 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Mar 2007 10:55:38 +0000 (10:55 +0000)
     and 'd92df12b19c3a9740bd99582f5b7044cc25f6316'


Trivial merge