From: Koen Kooi <koen@openembedded.org>
Date: Sun, 23 Apr 2006 15:19:52 +0000 (+0000)
Subject: merge of 40758b8f78807bab8274eaa33560a44c6ac8ec96
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~30^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5161b5fe592dadae4dda20e858baffb5e75b5725;p=openembedded.git

merge of 40758b8f78807bab8274eaa33560a44c6ac8ec96
     and d3c662025b052c84cfcdc2153cd3cf75465bae87
---

5161b5fe592dadae4dda20e858baffb5e75b5725