merge of 29e6764d0920c0357aa34e6e348e962da7fd316f
authorMatthias Hentges <oe@hentges.net>
Sat, 13 May 2006 22:16:31 +0000 (22:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 22:16:31 +0000 (22:16 +0000)
     and f10f5c840e362f84286526ff42c23d83c7c73e62


Trivial merge