From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Thu, 6 Jul 2006 15:22:50 +0000 (+0000)
Subject: merge of 3b10fe494db6e5e5f14deab8ed3c5865826faf0f
X-Git-Tag: Release-2010-05/1~9453^2~1323
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51c100d4db26616bfd0a8750f3cd60cbe5441aa0;p=openembedded.git

merge of 3b10fe494db6e5e5f14deab8ed3c5865826faf0f
     and 4c2c6d22cb72d6e2519963d42f2086588b362b2d
---

51c100d4db26616bfd0a8750f3cd60cbe5441aa0