merge of '75b7f0187937ff0cf23ec400350462b0cba2592b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Mar 2007 00:27:20 +0000 (00:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Mar 2007 00:27:20 +0000 (00:27 +0000)
commitdcba1b2ebad1a65a5640164cb851c448ea637498
tree00ad11371d789807e8556b8a96f4063b23fff079
parent573ffe08d8f08e9235d0c2ae0eb9ac86dcc22c51
parent440232bab6b4900c21700003c33313fb44c9904f
Merge ... '75b7f0187937ff0cf23ec400350462b0cba2592b'
     and 'd8a8e9bbd96a4458ef82b6a464d3f72deb83a546'