merge of ef08017d3c998883e45efdd77c3eb501cab7bc4b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 14 Sep 2005 09:04:51 +0000 (09:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Sep 2005 09:04:51 +0000 (09:04 +0000)
commit3e55b3b6242d97286fd15e420848cd5b6dc2052b
treed55d7f1cf0d199ee629d2b64258a4a50b1079fa2
parentd4b352bfeb515fb07f1b44c0332627de1d4fdeb0
parent18d316ca0c6bd7c9618abfd9f930519c4c04a611
merge of ef08017d3c998883e45efdd77c3eb501cab7bc4b
     and fc456cb461c57dc85e202c08bb32e3d8adedcd04