merge of 1b091d0abe5b4c834f7740acbbeaabddb98135d5
authorKoen Kooi <koen@openembedded.org>
Mon, 25 Jul 2005 13:23:15 +0000 (13:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Jul 2005 13:23:15 +0000 (13:23 +0000)
     and 24d3b1da99719d8ea31f1334c8c798391ca6c907


Trivial merge