merge of '4814b69151af2e49760bb9a3837c26ca674a7636'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 11:55:02 +0000 (11:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 11:55:02 +0000 (11:55 +0000)
commit1fed50a85dd97e56cf25576963739a97fb714dac
tree9f0286a41ed5bf8b659ba8f7855e27d185d4a62e
parent5296249776a7d81ee2db426e6f109de7e23b7053
parent09e9589ef3b0d9d29d0f1a61f2f74dfc256553ca
Merge ... '4814b69151af2e49760bb9a3837c26ca674a7636'
     and '6d598225ef381f53c7c567f433cb8223d13f098e'