merge of 'b4db7faff89bf68649ff9993f351d168e6ee5446'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:57 +0000 (15:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Jan 2008 15:30:57 +0000 (15:30 +0000)
     and 'f8ff231a78b465cc9a7581f07cda1458d94ad382'


Trivial merge