merge of '98b14503e47a28e2ea274f0efb9dca54e5ce4037'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 16:12:34 +0000 (16:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 16:12:34 +0000 (16:12 +0000)
commit087beea232b559c4608cc0b19da699e54ea20774
tree575d7759454835736ecb619c923ed363b419750c
parentf7d6eaeca1606cccf35ac2e39ee78891be028ff5
parent21e96269bce9de9ee8f6559750e6e5f3dce63e9a
Merge ... '98b14503e47a28e2ea274f0efb9dca54e5ce4037'
     and 'd375e276dbe8f04f6a3fbcd1d61fea0eee345d32'