merge of '1e14a41a1a368acd06c76c94c9e67fd660fd6d0a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:07:19 +0000 (14:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:07:19 +0000 (14:07 +0000)
commitb01aed544f505814ec9cffcfd739111c207b615d
tree9f8d9efb60b2e1538f2c6f5b19cede727e709e4a
parent0731ae660f6d7ec3b74ed4c6b9de087e4c484367
parente682c920024719209a58509a0c84fd3914293cf5
Merge ... '1e14a41a1a368acd06c76c94c9e67fd660fd6d0a'
     and '2061d23a8305360c778930e17936cc30ce12b906'