merge of 144528a9bcfa570dd68ffc7f5d3c9e1bd2ba097c
authorDirk Opfer <dirk@opfer-online.de>
Wed, 3 May 2006 21:50:52 +0000 (21:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 21:50:52 +0000 (21:50 +0000)
     and 804d7cf46ef394b8a493beb6a9cef002cd7bb4ee


Trivial merge