merge of '32c0fccda6ab3bd86ccbdddf72299fd683c82f91'
authorKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:08:01 +0000 (08:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:08:01 +0000 (08:08 +0000)
commitd0a553cb6786ac64b046be9e1bd56cdc8f825ab5
tree8ee0ea0f574c83f82bb6ebb1e503e76017ca1116
parent8a77e1148d43a44c1a19432d951032b155dda47c
parent6a29c84f3665f335577c12198590021cb4abc78e
Merge ... '32c0fccda6ab3bd86ccbdddf72299fd683c82f91'
     and 'f53c3029d838484abd7ce468cd46b0cffe6d0921'