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)
     and '6113cd3aa82bcb47774f0a89d931aedfe73e26ac'


Trivial merge