merge of '9145fc8b71029fb9ef74ec089e40d4b29737efe8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Aug 2006 14:08:32 +0000 (14:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 Aug 2006 14:08:32 +0000 (14:08 +0000)
     and '99f8110819f972fd2da3d1fb600f0c86319569ca'


Trivial merge