merge of 6a57c3e22fd06a31041fbb55ad83504a24c0b864
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Dec 2005 20:47:23 +0000 (20:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 20:47:23 +0000 (20:47 +0000)
commit3ef1a5c51ba93db382fcab0d84d937fc74b79692
tree5bb8dc1c408a8277bb8b7a841342413618219f6a
parent137af3e75ed807afa7e76a6b6052663ecd539b93
parent233688ec51a458d7833f331c1966582808eb6be6
merge of 6a57c3e22fd06a31041fbb55ad83504a24c0b864
     and dd8083dd620f2b95bcfa4b4878d1c64240995a10