merge of 942da6c39c03653040af872cf3d01adb58e9743a
authorMike Westerhof <mwester@dls.net>
Wed, 8 Mar 2006 01:15:31 +0000 (01:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Mar 2006 01:15:31 +0000 (01:15 +0000)
commit7b44b7da743362621d51e7b2f9540b32632dae9c
tree38c27aa07381f2864f8f18d0c12815c96ce4eda5
parent5b68dd3d1623c1f79f2c78939a1e4ef4283685b0
parent3d3c87cdc14c474c3b38011015aab7d31f3c6a96
merge of 942da6c39c03653040af872cf3d01adb58e9743a
     and fb01cb6b66688b09ba08a864e91986c7eca65486