merge of da1dc40350663056197750a19f00a46d20e267bf
authorGraeme Gregory <dp@xora.org.uk>
Mon, 20 Mar 2006 12:20:09 +0000 (12:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Mar 2006 12:20:09 +0000 (12:20 +0000)
commitae5317921527686b3a0ec41e0e86cd5cdbd973da
treecaee53d657c3c0a26cc3bd3e04c9a10ae896fa55
parent741855bef6c2ba84ef374d19afba1ad101f4cbf2
parent08c9337a82e50e26565453b3242396a127ef98c2
merge of da1dc40350663056197750a19f00a46d20e267bf
     and eef84004dea20080082b6e55d342f2a6fbe75b8e