merge of 7126e8dbb5ecde39f7b2362c65b90630fa5265de
authorDirk Opfer <dirk@opfer-online.de>
Wed, 21 Jun 2006 14:22:31 +0000 (14:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 14:22:31 +0000 (14:22 +0000)
     and effcba2a94876d18057282e965653353c5018d1c


Trivial merge