merge of '574f948e2e34c92b8569814f4622a4be67664b8b'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:19:53 +0000 (14:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:19:53 +0000 (14:19 +0000)
commit291ac197985b8fe9d87b4c07c8072b33dbc6a495
tree93c99e60949c9277dfc8e54b98f297fa2818339d
parent5013da3eac1b9eaa3e459e51868c972f35d13987
parent1bc8b5c01598dc5e86689d1bdc3042c3a06b2c64
Merge ... '574f948e2e34c92b8569814f4622a4be67664b8b'
     and 'e10b25001ecd4fdb4051e6efb417dacc1dd2b985'