merge of '1fa25c4ed2c76f537724929745c0f65656880cc7'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:01:55 +0000 (00:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:01:55 +0000 (00:01 +0000)
     and 'afcc206a6c21cda5ace989e895b14a6d341a213e'


Trivial merge