merge of '02399f609ed573f10db394149ecfa4897f7ceb20'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 01:13:26 +0000 (01:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 01:13:26 +0000 (01:13 +0000)
commitfecdca6f9c23250895d3e29023c113329a757589
treed6e1c01facf98cc0a9e5e82c0d94aa41406197e5
parent70b83560cd4f5e56871d23190f9e9e30f25d3f77
parent895e82706be82c8e83e31ba689c634decb55c80b
Merge ... '02399f609ed573f10db394149ecfa4897f7ceb20'
     and '81518d02cd7b89ed3b6efad1d9e3bc7f512f6172'