merge of 3b10fe494db6e5e5f14deab8ed3c5865826faf0f
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Thu, 6 Jul 2006 15:22:50 +0000 (15:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 15:22:50 +0000 (15:22 +0000)
commit51c100d4db26616bfd0a8750f3cd60cbe5441aa0
tree80b20e479f784272ed05b513ef6a6e63e9b73c4b
parentdec40f4609c745b24537c52fa719873bdf93103d
parentb5da7028a550cd44fa265cf30ed21a1941ad2bc2
merge of 3b10fe494db6e5e5f14deab8ed3c5865826faf0f
     and 4c2c6d22cb72d6e2519963d42f2086588b362b2d