merge of 184a2f969c1aae565fcc6649d5bc16c3f6b2e7b3
authorGraeme Gregory <dp@xora.org.uk>
Fri, 5 May 2006 08:54:32 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 08:54:32 +0000 (08:54 +0000)
commit42b9347b3838185bc30dd8cba40035b346c844f7
treed79bb8bb9a662c023013b0d1fe51866254d6913a
parentd3777c05942face0bbd7e2da5dfbb862f5d7978b
parent6de77d51375f042db0cb2c4e3c44f5895f4c7dff
merge of 184a2f969c1aae565fcc6649d5bc16c3f6b2e7b3
     and fd64cee80d213fd5efaa0473b981ec7e226f3907