merge of '9c284cd4dcd70a6810c5c2b6081836536cadeddd'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Jan 2007 18:50:41 +0000 (18:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Jan 2007 18:50:41 +0000 (18:50 +0000)
commitde9616bfd38d2840b4a27d0cd9dcc9cb473ff8d7
tree2f2041c88db821ddc0133a09246597e7efd687f8
parent1da45933698256b4dd8024aaa9c5f9ef76d82cf8
parent97f3b0361470dd48d9b4635094ae530a94a72a3d
Merge ... '9c284cd4dcd70a6810c5c2b6081836536cadeddd'
     and 'b047443ea33cc6dcb484249e6a25690afab83c4e'