merge of '6173a4536a04d6f35d0e9579922e1529d01e3327'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 May 2007 09:07:11 +0000 (09:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 May 2007 09:07:11 +0000 (09:07 +0000)
     and '930528a70985ba70ecb646588fb9d81faa1699be'


Trivial merge