merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:17:57 +0000 (10:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:17:57 +0000 (10:17 +0000)
     and '70cf6fac1508deeecfecf766f0b26020893dc6d3'


Trivial merge