merge of 4b8efd8ea23df73f8397284e81b3d7ba92173f77
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 1 Dec 2005 19:14:01 +0000 (19:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 19:14:01 +0000 (19:14 +0000)
commit233688ec51a458d7833f331c1966582808eb6be6
tree80125b40422a245b9fba1a202bd2a8a17427121b
parent28eefe04d0a4050b1a1e03598ece0177d2c5a606
parent1bb2e5b87e1c3b03641dfcf4d6ee90ea3db8bc49
merge of 4b8efd8ea23df73f8397284e81b3d7ba92173f77
     and b17f8aca9921dd6c79812ee173e34e711b252634