merge of c10f2ae04603d602b3a9204d9469c590262dfdf9
authorDirk Opfer <dirk@opfer-online.de>
Tue, 4 Apr 2006 12:14:37 +0000 (12:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 12:14:37 +0000 (12:14 +0000)
     and e17f8316387431c6724b289c19011d99b8758e2b


Trivial merge