merge of bcba7ea1e859a907d265bd56e20c0860217b3728
authorGraeme Gregory <dp@xora.org.uk>
Wed, 1 Mar 2006 16:30:20 +0000 (16:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Mar 2006 16:30:20 +0000 (16:30 +0000)
commitce789dd71ea9a3654986177a5ccdd9fec544a630
tree50393d5221bf77cb3466bf885ce23d98afed5ff1
parentc672d54b9f4cdc80b9cf1140a384eb6f59a4aaec
parent3ac46586645727f3385b3ab8baa51248ba3bc1bf
merge of bcba7ea1e859a907d265bd56e20c0860217b3728
     and dfe9588c3d838fc005a999a216b1c85f3d4e4e3f