merge of '34310ed029b0ccbcd834f89fcea4e24c5d044ecc'
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 18:28:19 +0000 (18:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 18:28:19 +0000 (18:28 +0000)
commitad3b62aa520cfd714e323317251e4dc48fa8785e
tree3c0dae3e1af74458fa2fb1d4d203ad5dbd015424
parent8948c85474197808e9c06468618a23d82e513250
parent8571f7fe1d209f3b14f70d4ccb009122c7308fb1
Merge ... '34310ed029b0ccbcd834f89fcea4e24c5d044ecc'
     and 'e2e2ace957e66ed034ec39428d251e7ed9d0bb50'