merge of 1ab8e3772bfbaecdabe093d92f28f8c2148e4f61
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Aug 2005 21:02:16 +0000 (21:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 21:02:16 +0000 (21:02 +0000)
     and 231e6c9de778cfd05359c4ae1ef7485ffbacb78b


Trivial merge