merge of '1f4e0f888e7980338bb85c2dec1e2387e28fc91b'
authorKoen Kooi <koen@openembedded.org>
Fri, 1 Jun 2007 15:01:26 +0000 (15:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 1 Jun 2007 15:01:26 +0000 (15:01 +0000)
commit261b9ad61fd9a039489b8432fc26769b4348e548
treee1f316e42e56d4dfd8bf70d149ddd73a1938ec82
parent27f69443f5d63b18bed1baa9112b94a7df61acbf
parent32a81c73f2d14e67d711cb8e740e2efc62225dfd
Merge ... '1f4e0f888e7980338bb85c2dec1e2387e28fc91b'
     and '61320145c8e5ea3c80d409d857d23c62daf28d45'