merge of 701e498cb6b22382fd13e288d7b47f93abb32feb
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 May 2006 14:51:32 +0000 (14:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 May 2006 14:51:32 +0000 (14:51 +0000)
     and a3de2e3141246a68170d4fe5e4a7390e7ebe041e


Trivial merge