merge of '6173a4536a04d6f35d0e9579922e1529d01e3327'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 May 2007 09:07:11 +0000 (09:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 11 May 2007 09:07:11 +0000 (09:07 +0000)
commit06e66f309b67709c121c5105bf7feec6895674f1
tree2d44763a57ecd927b7e6686e8da821311e2f746f
parent57e983188b4363041c0100df837f9a3e18416cda
parent98e3d2d3b4bbbd17dd5417ad47a44277e9613bfd
Merge ... '6173a4536a04d6f35d0e9579922e1529d01e3327'
     and '930528a70985ba70ecb646588fb9d81faa1699be'