merge of 520f026b4456efe34f54b717ef077c88acd1b92b
authorGraeme Gregory <dp@xora.org.uk>
Sun, 29 Jan 2006 00:08:38 +0000 (00:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 29 Jan 2006 00:08:38 +0000 (00:08 +0000)
commit576b5f7ab08c71b43954f4c3124521e48f4c7c59
tree87168572280b26f1910c670e0848262250e0f88e
parenta93d511c437c80e9a13c9d2ff7fb680cffbe99c5
parentbd045ee355b2af7c5c7139936962ab208df670ee
merge of 520f026b4456efe34f54b717ef077c88acd1b92b
     and df87e4e26b065aa023b3fcb52671304738842030