merge of 68390b70af2829661023742b004679b066e6527f
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 10 Oct 2005 12:21:27 +0000 (12:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Oct 2005 12:21:27 +0000 (12:21 +0000)
commit49e660f85d5e0c0a21b5dddb0b91e31c151ad235
tree137abb1c9e0703dd49008968edcd38636fa6108f
parentfeecf77b449aa8189d5799aba4c393f46b29ed11
parent26c58f36541163909d32a3ac6b0c2715ce1ee5a9
merge of 68390b70af2829661023742b004679b066e6527f
     and ccd148440f2ff94def2106f7566d0582e81a7e95