merge of '02d2a2fcfe802bc2a50b32abb39c188461f83cc8'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 10:20:07 +0000 (10:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 10:20:07 +0000 (10:20 +0000)
commite31efe925d781e9fe82f358158e2f1bc4e44ec30
tree990e9d3358b1bcafdc02d760b18a78e869b59972
parent6f2277c2180494689d2955bc033980ba9dd6646a
parent70b5a262fe4711421b53bec524f67c92e9529f00
Merge ... '02d2a2fcfe802bc2a50b32abb39c188461f83cc8'
     and 'a83dd390e6cc7d972407dc06660f6b890764d341'