merge of 3c8d71924f7bdcbdae81f3b602e2657fc399b427
authorMatthias Hentges <oe@hentges.net>
Sun, 19 Feb 2006 20:57:48 +0000 (20:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Feb 2006 20:57:48 +0000 (20:57 +0000)
     and 583dc1afb26b33abada793ed8c289148a40e6eee


Trivial merge