merge of 02ca6b9a1133a17f5e162779af2eaee48c4115dc
authorGraeme Gregory <dp@xora.org.uk>
Thu, 6 Jul 2006 10:27:57 +0000 (10:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 10:27:57 +0000 (10:27 +0000)
commit536d14e5749ab489c018f30abad07ac93dadc4b6
treeb61cdeaae3a4a18bf150b6fb5ea72b94d427fa3a
parent0a893d07e577cf9eb3f5a874977027eae553ce64
parentc794a1af0d03ad7dd1e0605b26bcea058a4af625
merge of 02ca6b9a1133a17f5e162779af2eaee48c4115dc
     and 5beb3d8e6566e09fca5c9db902bd8db27eb92282