merge of 294149e1b46007db8f485b7af77b7d19aece92c1
authorGraeme Gregory <dp@xora.org.uk>
Mon, 1 Aug 2005 11:46:31 +0000 (11:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 11:46:31 +0000 (11:46 +0000)
commit96ed417296ded1a1dcc02839ebef0ade909f2a8e
tree9b635276f739c1b4c26b0106659e2115a2532366
parent71e94a548141b31a836788f416c0f5c3c9832267
parent4659f45317be046b79202bb800a42279549c9289
merge of 294149e1b46007db8f485b7af77b7d19aece92c1
     and a7b3addb3bbed05ecfeaadd75fe958bdff42cd8e