merge of '042829d9f6fe316741a3bf0b701a9d2c9ae0f632'
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Sep 2007 19:01:28 +0000 (19:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 23 Sep 2007 19:01:28 +0000 (19:01 +0000)
     and 'f7bfccc01bfb61f63618a3f4859cc468eef65027'


Trivial merge