merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:22:16 +0000 (11:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:22:16 +0000 (11:22 +0000)
     and '8091ca9b08503f4700e05ee8973cec755727ed4a'


Trivial merge