merge of '60605dfd26307f8e6c10619a67ff31ca6dead66e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Oct 2006 10:32:44 +0000 (10:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Oct 2006 10:32:44 +0000 (10:32 +0000)
     and '923666cf724220418fa0c908d6d269232f1b744b'


Trivial merge