merge of 'a81be4a9e6a337df1765dd0899498f17ec68c272'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:31:26 +0000 (11:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:31:26 +0000 (11:31 +0000)
commit3b3f3e9a941121bba91ce0bcacc1c0cb1bda0223
treeaa956821661041e40e14a6bda7c86f872bee4021
parentd9eb64a436c4ddfe30ba5454d1becd765c3cb7d5
parent9fbbb5505d79a4aa4acbba1e61898f5adcf00f85
Merge ... 'a81be4a9e6a337df1765dd0899498f17ec68c272'
     and 'bb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4'