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)
commit7c4ae4bad58bb7cfb6dbd2d72d7ba6c226c763d0
tree22a0f104c6e557c5bfd1be2555c90fd3ebfe07d6
parent172526769c6eb6c33253bec9c192f9750a3a6c6e
parent466098090f7a850b420e18bda4a17bf671d791d4
Merge ... '0e8df4b23554bb3ad3929e08fff126dce73bd38b'
     and '9f2c0aa63cc70395cce09bc049588ba5dfde1888'