merge of '07a342693675fe2b1daacf0eb62302579d9fade3'masterorg.openembedded.dev
commit265b01cfeb217c0847827df9862750c08b2f4658
author <rpurdie@openembedded.org> <>
Fri, 16 May 2008 10:13:43 +0000 (16 10:13 +0000)
committer <rpurdie@openembedded.org> <>
Fri, 16 May 2008 10:13:43 +0000 (16 10:13 +0000)
tree903ca6f4b75c739b6627a3b6c8c265c51d6df831
parentd1e583c9b03941ee9ed59ee6f6172b167428d7ab
parent469930310f7c095b8b2cef0ee319a93239451fc0
Merge ... '07a342693675fe2b1daacf0eb62302579d9fade3'
     and 'ea87a62ffb26f02649d7a8b5be07fcb5b84ba802'