merge of '60961ec466bc4987a9fab147de3b7703dfe6317f'
authorKoen Kooi <koen@openembedded.org>
Wed, 15 Nov 2006 22:47:14 +0000 (22:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 15 Nov 2006 22:47:14 +0000 (22:47 +0000)
commitdb90c2e6b62dc803a50ee5587db177f6039c0ee2
tree72e2c1b2a9d074007bae6d44225e78dd7ea974d5
parentf8cf9e31034c2d7a362134ccb4dbd27cf177f3fc
parentda7c6ec1d33c3159683a9c79734f0dc4e66a4f7c
Merge ... '60961ec466bc4987a9fab147de3b7703dfe6317f'
     and '8de3a261a06263fdf455610b427ac1a092b1acf8'