merge of a1939217dc9fb1b7e264f67745fe46df7a44ef39
authorMatthias Hentges <oe@hentges.net>
Sat, 8 Apr 2006 22:08:58 +0000 (22:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Apr 2006 22:08:58 +0000 (22:08 +0000)
     and d62bbd0de1cab214a18a63acd9c989c1a4d9dcf5


Trivial merge