merge of 8c6c13a2a369d86ba5e2a6f3a63e11594969ef7a
authorHolger Freyther <zecke@selfish.org>
Mon, 12 Sep 2005 17:44:27 +0000 (17:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 17:44:27 +0000 (17:44 +0000)
     and f32276224819db8dae64e7b45d05365785d05439


Trivial merge