merge of '4da6387963b0050f0f62cbd7daa0a2826339e342'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Nov 2007 13:22:54 +0000 (13:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Nov 2007 13:22:54 +0000 (13:22 +0000)
commit962c0ea966a402b5b59e87f8e2b66522b2767c0b
treea6d0e98057a5c5370aaf7a275a764a552dedaf07
parent705918081ea0ec07eb3290929cc87935c4ae6790
parent48dc6e4819b4f97e3b8f518d919c53825bcaa460
Merge ... '4da6387963b0050f0f62cbd7daa0a2826339e342'
     and 'bff6f2c3b18977b23d686ec5fb277c0bd904bb5c'