merge of '5b5a99c95ab4ee23e5e5c0460ba6744420c75edb'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Jan 2008 17:26:49 +0000 (17:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Jan 2008 17:26:49 +0000 (17:26 +0000)
commit89230c2835a3b2d8956ae583cc15336ad3db9b2a
tree8c5cac64c1cf29ad846357af9cabec520f51413f
parent1f3a0258e6e34ba036e057b5cd93f085c80f7147
parent2e3d17710c3059dce30901211439ce5124f0372d
Merge ... '5b5a99c95ab4ee23e5e5c0460ba6744420c75edb'
     and '84d6e8f79077a6afd15b7c4d1b4260dba2fc07e6'