merge of 4903b1d50173ddff067e80fe315602281ea135df
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 22:14:08 +0000 (22:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 22:14:08 +0000 (22:14 +0000)
     and b5a7cc169d86a6243a994a5515c02abed4f69e1b


Trivial merge