merge of '11f0ee99928fd3f1abcbb6452894ad035ca86caf'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 22:50:59 +0000 (22:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 22:50:59 +0000 (22:50 +0000)
commit4e92b1387151891718014d27a15b1174cffed2f8
tree9a86d7eb4dd06dd60af17e6faf9439cb37330539
parent5dbdfa6466b4eca1008a13fd2051d0bede3d0771
parentb700150f3b093619d104a2a3e24b856e5a2f4dbf
Merge ... '11f0ee99928fd3f1abcbb6452894ad035ca86caf'
     and 'a5e5f5fafe980604ae345371946d6043cff860d3'