merge of 'ab20bf4ac663aeb2ac1f0fd51955d412dabfe7c5'
authorKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 14:39:41 +0000 (14:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 14:39:41 +0000 (14:39 +0000)
commit92a46fd09aa4d7988cd9e60d15af4bd8a96df2e9
tree95c8d5fc22e341f5440eb6378c481d97e507fde0
parent39568f07d978a6d84d21dd29df689007216ad8fc
parent2284beb65e8c2ae4f0b9778b7e6f8adc7798c2a9
Merge ... 'ab20bf4ac663aeb2ac1f0fd51955d412dabfe7c5'
     and 'da07e320252fd12c19a05134932a5efed8d160d5'