From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 5 Jun 2006 21:16:14 +0000 (+0000)
Subject: merge of 4214be31dc929ef728c46eb617bd9385b68e80ab
X-Git-Tag: Release-2010-05/1~9453^2~1419^2~11^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=526972156e164b8ab8248bf31c5472aa1c16df29;p=openembedded.git

merge of 4214be31dc929ef728c46eb617bd9385b68e80ab
     and f0fb79930fa609615c8b1233c06c57a2f22a3109
---

526972156e164b8ab8248bf31c5472aa1c16df29