From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 26 Jul 2006 23:41:12 +0000 (+0000)
Subject: merge of 0a9016d47dc74f75d91c7ff85ed9b69f3d1cc8f8
X-Git-Tag: Release-2010-05/1~9453^2~1101
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf4c91d2086933608dfbb193bdd89f50afb02c57;p=openembedded.git

merge of 0a9016d47dc74f75d91c7ff85ed9b69f3d1cc8f8
     and 2a31a16647e31d6ebc8073aec234852c37532efe
---

cf4c91d2086933608dfbb193bdd89f50afb02c57