merge of 01783a925142e303a35b3d5011062c449f634fce
authorGraeme Gregory <dp@xora.org.uk>
Thu, 2 Feb 2006 14:49:37 +0000 (14:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Feb 2006 14:49:37 +0000 (14:49 +0000)
commitd74d62d73c5f6603ccb373da764e97e664d1a6bc
tree4348356898aac84851108d237551157bfd9df483
parent16d8bd8d2e0f4f712c88bd65a7f4289f16a160ca
parent2a5a60efdc31bd7fdd76b1c78f153f87febdfccb
merge of 01783a925142e303a35b3d5011062c449f634fce
     and 6d8ef5d4947f1ffacac1ee8f3b3dd79e90c4a5ba