merge of '3d9d209dc4aaf9913ae7f9891a5736abb9e2d4a7'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:14:22 +0000 (00:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:14:22 +0000 (00:14 +0000)
     and '57cd3499be5d92fbeebec0c4a38a62efd8d116ac'


Trivial merge