merge of 0c6591535a11955c424cb90d7a157b640d408d35
authorRod Whitby <rod@whitby.id.au>
Fri, 11 Nov 2005 15:08:29 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Nov 2005 15:08:29 +0000 (15:08 +0000)
commit7d83b739ea1605aa228d095e9c06a339d01db47d
tree24c258fa6da505fe7cd8042e3beb41cafde7249a
parentdbd1a76089b2b95b9c57fff7dd7d22c67a93a4e3
parent5fb88e711e1f6614c358d6a331e81881ba11d1bc
merge of 0c6591535a11955c424cb90d7a157b640d408d35
     and 38425be5fd91cb4948ea49598a78227846a0b730