merge of '5d703df48687b18de3beac73a0d364f47a49a736'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:38:56 +0000 (10:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:38:56 +0000 (10:38 +0000)
commitaca5ee73eb95e4ee5d3d3b7ee598efc0accac968
tree271205ab44e1578df86bf6cfd96a9411f2667303
parent4bd9958bc62c406c2a0de1715893a06f1215aec0
parent63bbce41cccf6a629ed4bdc66b3151bac64568a7
Merge ... '5d703df48687b18de3beac73a0d364f47a49a736'
     and '9035f9a5f71e2ba479a0c67ef3e603dd91fe4cee'