merge of '13a2fd4a576e4ad16ad4a7365dddd911d1a008c9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 13:56:03 +0000 (13:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 13:56:03 +0000 (13:56 +0000)
     and '1df70c8f4e39ea30b3a0d2231271e7883161ff19'


Trivial merge