merge of 4df4d7b459a3415cf0a91eca732e547c9ba278a6
authorMichael Lauer <mickey@vanille-media.de>
Fri, 26 May 2006 20:52:01 +0000 (20:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 20:52:01 +0000 (20:52 +0000)
     and be0f87375d77d8115b0c83b7a9b731eb5062802d


Trivial merge