merge of '6eab8aa968a601fef1ab31a6236358e693096ae9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:38:25 +0000 (11:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:38:25 +0000 (11:38 +0000)
     and 'dc8de3e0e3155524f86e2184b5e33f5944fdbcc3'


Trivial merge