merge of 34633137c0dcdd46422c42e3058d55cd967590bd
authorGraeme Gregory <dp@xora.org.uk>
Sun, 29 Jan 2006 20:45:46 +0000 (20:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 29 Jan 2006 20:45:46 +0000 (20:45 +0000)
commit2228ad0352168c2686c945b7b481be0bacb3b193
tree3d08137c9824463555ad6efb60d4bda2673f0703
parentd682afd3a044dd4cda54180d541a92abeda94d31
parentcdcfbb3df582467c319b8d73c75669b852207f92
merge of 34633137c0dcdd46422c42e3058d55cd967590bd
     and dde70ffa9a39c0416ae2875c26c72ab5016c8850