merge of '60605dfd26307f8e6c10619a67ff31ca6dead66e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Oct 2006 10:32:44 +0000 (10:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 12 Oct 2006 10:32:44 +0000 (10:32 +0000)
commit6b9f8a476c616019722def2751a2ab7f27359c73
tree5fa4506facb8fb1e3a6c90ad4494678d387e9082
parentbd83a5a85bc3de031783f587977d77fc9a596df4
parent06aae1ae5194cfb0b8d93b9192427b60232dfb41
Merge ... '60605dfd26307f8e6c10619a67ff31ca6dead66e'
     and '923666cf724220418fa0c908d6d269232f1b744b'