merge of '325cca716bfbf3db0f668af761161a7b40a705e8'
authorKoen Kooi <koen@openembedded.org>
Sat, 21 Jun 2008 12:19:35 +0000 (12:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 21 Jun 2008 12:19:35 +0000 (12:19 +0000)
commit7956813ed6ef27c11f63d2d3bfdeae6ef7b71b76
tree3cd4dedef93f90efd0814fe403a0bc78b51b5a2a
parent5d6929214bc3423fed9b3e55983b6133ed69c34a
parent43749f8ef08ef2847ec148e20e09b9f35a356b74
Merge ... '325cca716bfbf3db0f668af761161a7b40a705e8'
     and 'ea9bece0e1c09d6d7e85904db6d8adeb4f4588c2'