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)
commitc87de4ed990d8a621082a346a40a0db0c52d94eb
treeacc6f7716e0a4967e19ccfd420487e62d3c73e8a
parent9a77fefca0fd0d8fe2323e47e7187c3b8d1f3a79
parentea7cf7899c42b1da3e9a7dc070c807ec1f38f75e
merge of 38c34687521951dd251b87f48f5c8a4edeced577
     and 696c4941de7c904623c36f238e02fea6008a7567