merge of 'd8e93653bdd44929cd8b804051b01cad64bc4550'
authorKoen Kooi <koen@openembedded.org>
Mon, 2 Jul 2007 12:22:37 +0000 (12:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 2 Jul 2007 12:22:37 +0000 (12:22 +0000)
     and 'f273d173d517ba98778745b37b0f630d81deb1ee'


Trivial merge