merge of '28c0b47110d44620be450547dae379ac6a2c8868'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 09:23:36 +0000 (09:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 09:23:36 +0000 (09:23 +0000)
     and '309de2f5dd65f1b32e8c78500159efce669b5a24'


Trivial merge