merge of ef08017d3c998883e45efdd77c3eb501cab7bc4b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 14 Sep 2005 09:04:51 +0000 (09:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Sep 2005 09:04:51 +0000 (09:04 +0000)
     and fc456cb461c57dc85e202c08bb32e3d8adedcd04


Trivial merge