merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Jul 2005 11:28:07 +0000 (11:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 11:28:07 +0000 (11:28 +0000)
     and 9b0371bf5547d5dcea1bcd07f29bc1aceefcdd98


Trivial merge