merge of '458c1e5b4ce9ec5e2754fea2e5c1df842fe9936c'
authorKoen Kooi <koen@openembedded.org>
Sun, 1 Apr 2007 08:50:18 +0000 (08:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 1 Apr 2007 08:50:18 +0000 (08:50 +0000)
commit4c13c2ad72f6628cb677c5381bad3b3ce3dc70e4
tree9388fcf0e35764035f5697b42ddcca6bd4ec402b
parentd8825d643238771237cce78aa3610184cd6c971b
parent247c43566ded9527eac5d1a6e3c9f2afcf02e5f1
Merge ... '458c1e5b4ce9ec5e2754fea2e5c1df842fe9936c'
     and 'ff961d04d5b4acc6a7fa9aea54c938273c1a34c8'