merge of 8efb6d518237c849bc9f83f3b790e512ede468b5
authorHolger Freyther <zecke@selfish.org>
Sat, 13 May 2006 23:13:49 +0000 (23:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 23:13:49 +0000 (23:13 +0000)
     and ca8983277c182e7af1fe480f0311ac4751b6a178


Trivial merge