merge of 284d424308c92240b4986482d28587433a310a21
authorHolger Freyther <zecke@selfish.org>
Mon, 13 Mar 2006 23:28:18 +0000 (23:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Mar 2006 23:28:18 +0000 (23:28 +0000)
     and 831d64598feef6ffc7121858519c98fc47d99b14


Trivial merge