merge of '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 07:25:52 +0000 (07:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 07:25:52 +0000 (07:25 +0000)
commita3289efbdab19b64283d2532ebee89f244234a23
tree51b1fa5c707fe679edc09a47c3de79409a283e40
parent22ad69242d3405c0e86ff148ab186bc8ad91f09b
parentcac9382f1539113fe1216d978278173bdec1bc26
Merge ... '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
     and 'c1c78bb1b00381defbcf8941f26b336eea75e8b3'