merge of 6da8c85dc8bb8f2cd343e417a2e33cb7f19c1dda
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 20 Jul 2005 17:36:56 +0000 (17:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 17:36:56 +0000 (17:36 +0000)
commitfdade0602496c2aaad2fb011a124ac65fdb86278
treef8a97ffb9f85d04e18305bbb8dd623416cf80320
parent7c29f05b1ff45426aefb3c3fa250d8b0d0f78094
parentef1b1e31ebf2671c661b172749c0bb31370d2105
merge of 6da8c85dc8bb8f2cd343e417a2e33cb7f19c1dda
     and a073097d84a515599a3c0d13bd06d0e9cc9beded