merge of '4f01b212b98a4b372493c483af8fda8300f38063'
authorKoen Kooi <koen@openembedded.org>
Thu, 20 Mar 2008 12:33:25 +0000 (12:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 20 Mar 2008 12:33:25 +0000 (12:33 +0000)
commit7d91312121b91165cc2f06274b9530508b375a10
tree191454925ad9bc4e8437dbd4d5a8e7b2bb9c3aef
parent265c4ae526d752c25cb2f0d2ab7d1bb844f6aa27
parent23de7a3b28cdf268b1cd5c9d25445244e55f62b2
Merge ... '4f01b212b98a4b372493c483af8fda8300f38063'
     and '776dc04c7eba19512692b4d40a123d45e6adb862'