merge of 0e4f20b5f73c66a8b0ff442658306eb24666a628
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 17:14:55 +0000 (17:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 17:14:55 +0000 (17:14 +0000)
     and aa37801871f021c37b88d43fee5f45ca91367b15


Trivial merge