merge of 38c34687521951dd251b87f48f5c8a4edeced577
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 22:21:24 +0000 (22:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 22:21:24 +0000 (22:21 +0000)
     and 696c4941de7c904623c36f238e02fea6008a7567


Trivial merge