merge of 71e92e1770bc5fc32e38bca7b672012a47870d1f
authorHolger Freyther <zecke@selfish.org>
Thu, 16 Feb 2006 13:40:52 +0000 (13:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 16 Feb 2006 13:40:52 +0000 (13:40 +0000)
     and c11d7470d1a10d77cc57dd2233dc262fb6fff077


Trivial merge