merge of '159bde97bf43587e841741dc7ae1798e02ad78f6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:22:59 +0000 (10:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:22:59 +0000 (10:22 +0000)
commite25324a877e7cc1709b2d959bad89534cbe0ef54
tree55858be9bd55b204f3a22e461d6ec3bf2fc0919c
parente6baa476144256f6e028c88d89f3635e013d8373
parent785630abad48940514a343d6f36312751e263bd7
Merge ... '159bde97bf43587e841741dc7ae1798e02ad78f6'
     and 'b37835d2c741793df9f326066d6f5563e070f405'