merge of '348938c3555546469580e952fd705c085456a048'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 14:15:09 +0000 (14:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 14:15:09 +0000 (14:15 +0000)
     and 'fd7e0b1c50f0c7757052ee02bc3a484be06cad6e'


Trivial merge