merge of '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
authorKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:15:27 +0000 (13:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:15:27 +0000 (13:15 +0000)
commit810fb5eba6f2e57ce61b96361fb3445aac331ddf
treef8163e4cf5da313936f92687f28821937f83fe09
parent01cd0b7513ed1071d35c551757f66a7bae6bb733
parent5194151b2cfa37b8444614603dda36b067b2a86c
Merge ... '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
     and '5f904f7a12f760543efbb50eed318ac4e50f6558'