merge of '63851b92b9273aff39e9034738719537beaaad00'
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 09:10:43 +0000 (09:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 09:10:43 +0000 (09:10 +0000)
commit83f12827ab0d53ea3f5f38d4f97df838f1a2a8a2
tree01e47e1c6042c9053dd8a8343937497996283904
parentcbea2f4a751b5ee8fb1343a05742f8b8765dec7a
parent65b177e69a5590bdb756c5a9a489fbd22af8ebf0
Merge ... '63851b92b9273aff39e9034738719537beaaad00'
     and 'ad034cb2f897fe4f3dcd97de6ff164e3a696598f'