merge of '1adc26104e5b3839a7f67202324e1fa246a20443'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 12:55:17 +0000 (12:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 12:55:17 +0000 (12:55 +0000)
commit791e90665936de6b2e33887bc1d55d8fd14ce8d4
tree75a12d6af3dc3f7010acb34c1275e392d4c1ff0a
parentdfa0cc8b70cee3af10c06fe2eccaab75dbcb7555
parentc08eeb8f1bee8ce78dee1f0e3cb8064b7b677ea8
Merge ... '1adc26104e5b3839a7f67202324e1fa246a20443'
     and '6113cd3aa82bcb47774f0a89d931aedfe73e26ac'