merge of '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 09:42:39 +0000 (09:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 09:42:39 +0000 (09:42 +0000)
commit192b75fee20fbe56dd1cf3326ed77eb4729db37b
treeeb30768390b59ee12840991e1818dd08651b7bd4
parenta708d25703446b17b861278f42002c2b32867037
parentea4daea4707be755078b6cb208379b75ad53eb24
Merge ... '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'
     and '5da1612b322f56f442443b8546bbe8e7a75289f3'