merge of 'aa908f9edf3bb81b538c3115f62602d8a40d01df'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:27:04 +0000 (13:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 13:27:04 +0000 (13:27 +0000)
commit341125a0b12b9ba46b3587d5d4b95a6f11beaaae
tree0f1b32f58c2045f8cd9683525cfb5e20341781cb
parent6f018366d3b7fdfee797c561c8340758a543b831
parent811a2595f5edadf001da84f6c9fe2f99bb31a798
Merge ... 'aa908f9edf3bb81b538c3115f62602d8a40d01df'
     and 'd99a2eec5529a214f0a05a5ffe3a8697d12c08f0'