merge of '2df98cb93e1c3ab67c675e3f11ef036ea57dd19b'
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Aug 2008 15:47:12 +0000 (15:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Aug 2008 15:47:12 +0000 (15:47 +0000)
commitf3c74f6b708586d0a996daae1fa8b5ffa3b25cb6
tree4df47bc9923d49a4c61d724f8f918e7d6811a696
parentbcbaf180430454102b5105e21f5db1e83596ab7b
parent3d947531d6e2a313b6e68631c93e50dc9b956b96
Merge ... '2df98cb93e1c3ab67c675e3f11ef036ea57dd19b'
     and 'ba9a800ebd8fd6f90db1e022cd9a342c69339bc2'