merge of '17456d839ed6d5a9ca1e700a26784cc663820a4d'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 20:20:32 +0000 (20:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 20:20:32 +0000 (20:20 +0000)
commit342f01d322bcc1ee34549fdc8f8db7555568b329
treeb298385cc8df877bda080abab8a173011e27247e
parent330fe728fbcc78cc404239b2f799fafb33fc64f2
parentc1cd7092d2359fa9661dffbfb0542338f419caff
Merge ... '17456d839ed6d5a9ca1e700a26784cc663820a4d'
     and 'ffd5b1436a28fe33ef6213ae4b0371af61aad94f'