merge of 'cf825d08cde9f17188ff1a768443dd312658cb7d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:01:05 +0000 (15:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:01:05 +0000 (15:01 +0000)
     and 'e00e94a7a53482bae8665a86de5dfc79645b03fb'


Trivial merge