merge of '01f644d2342bc10e83344874b38bcf616e576ad1'
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:52:38 +0000 (15:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:52:38 +0000 (15:52 +0000)
commit383888843ffcd4b08fce785f8227ab2cfa23ebe4
treeaeb7ea53364a13982990242441727ab99a18d39a
parentb2b1947eefbde86caac32426bf1af7746e7875b0
parentf40d15c7a8926d416c695439245dde361c83a29c
Merge ... '01f644d2342bc10e83344874b38bcf616e576ad1'
     and '373f8ffa5274d65898c8263d4e8f9b7e6edc7ac5'