merge of '0e8df4b23554bb3ad3929e08fff126dce73bd38b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Nov 2007 21:43:56 +0000 (21:43 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Nov 2007 21:43:56 +0000 (21:43 +0000)
     and '9f2c0aa63cc70395cce09bc049588ba5dfde1888'


Trivial merge