merge of 2825a1f6c313a584c9a9be152d255ab1e4bacedb
authorMatthias Hentges <oe@hentges.net>
Sat, 23 Jul 2005 17:54:51 +0000 (17:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 17:54:51 +0000 (17:54 +0000)
     and ad18daa1dd522a0e575f57713e7f253557cbde11


Trivial merge