merge of '49d63989ff625988d6bb90696a2abb7d3fc939bb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 14:25:02 +0000 (14:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Jan 2008 14:25:02 +0000 (14:25 +0000)
commitc21939e0df0a469763cee67fa7f8bf6f5099ccd9
treef9e012718ddf59a7597b677985654e449c1be61a
parent93f4e05b6bd5a0140aaf827e9626bf42582437bf
parentacb42bcc7d501026e7a41638645201850cd02dac
Merge ... '49d63989ff625988d6bb90696a2abb7d3fc939bb'
     and 'e470e7389a3efbef69e6eb562d9457d642b782a1'