From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 12 Jul 2006 18:45:01 +0000 (+0000)
Subject: merge of 1a01264e65b67ef85967a894ab8c3c3f4ceec72f
X-Git-Tag: Release-2010-05/1~9453^2~1237^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=013176285df78d1dcd75605c62271eada172c6ca;p=openembedded.git

merge of 1a01264e65b67ef85967a894ab8c3c3f4ceec72f
     and 1fa6c1c3697b65f0d94b189442fe08e25d336652
---

013176285df78d1dcd75605c62271eada172c6ca