From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Fri, 7 Jul 2006 15:25:24 +0000 (+0000)
Subject: merge of baa4b93cbf7cd2b34806985948c44762c4682d0d
X-Git-Tag: Release-2010-05/1~9453^2~1301
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c772d44e1faa794e0259062417c8d4704ae40f;p=openembedded.git

merge of baa4b93cbf7cd2b34806985948c44762c4682d0d
     and cbbb31a3ac41c6b9044ddf94693c36ad7b5f7832
---

77c772d44e1faa794e0259062417c8d4704ae40f