merge of 053ac8efabaade9bb5a09b2b2cc0138921efc3b5
authorHolger Freyther <zecke@selfish.org>
Mon, 19 Sep 2005 13:30:26 +0000 (13:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Sep 2005 13:30:26 +0000 (13:30 +0000)
     and 9a1d804567e473d4e492f45e1fd79b553fa38e17


Trivial merge