merge of '21c4008bb1561ef0bd0768e77c6048127fb19f77'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:40:57 +0000 (10:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:40:57 +0000 (10:40 +0000)
     and '78239ce7f77a2301fe9e0775a684e0292dafaafe'


Trivial merge