merge of 60b47beac72c6f1f23514b42a309716b470d471b
authorMatthias Hentges <oe@hentges.net>
Thu, 21 Jul 2005 03:28:55 +0000 (03:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 03:28:55 +0000 (03:28 +0000)
commit5c8f0ac921d317857f53af063b6158fe450e3977
tree1d419644017f9a9f2acc62908c7066806cdd078a
parent106a843b00bc7003f3dcdaeca83d453b595b49c3
parent79854f3a16e4bd18ae87450fde8061778f192585
merge of 60b47beac72c6f1f23514b42a309716b470d471b
     and a6f1ef5bbb3cac8192d0a7bc6d5c64b301e70463