merge of b0b409a47fdbf9ac358337e7b92f39a6ee431b32
authorKoen Kooi <koen@openembedded.org>
Sun, 11 Sep 2005 11:03:30 +0000 (11:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Sep 2005 11:03:30 +0000 (11:03 +0000)
     and f87c918cac822cb9dfdfeda16a60f2a5a662d716


Trivial merge