merge of 4945900d6b970a0180dcbf40306e9caa5fd900ff
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Jul 2005 22:41:40 +0000 (22:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jul 2005 22:41:40 +0000 (22:41 +0000)
     and baadb7d4c420b583d88b6fc26b79d5a50fe5a888


Trivial merge