merge of 12ed033e3e5826427e0456f03ba57c34edef42c0
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 29 Jul 2005 11:11:51 +0000 (11:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 11:11:51 +0000 (11:11 +0000)
     and e56174b33bfcc4e2ed05f97322cf481ccaaf624a


Trivial merge