merge of 0fbf41554fa2b01e83cab0aecfdcef09910bf4a1
authorHolger Freyther <zecke@selfish.org>
Sun, 14 May 2006 20:03:00 +0000 (20:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 May 2006 20:03:00 +0000 (20:03 +0000)
     and a4604133216c9da45903db0bfffa11d7b707cc12


Trivial merge