From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Feb 2006 20:27:38 +0000 (+0000)
Subject: merge of 330dd41d9c920bd7109ac7473efd170ce60c9cf7
X-Git-Tag: Release-2010-05/1~9453^2~2326
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef71654f8794259f649eecbedd5b37888e18aecc;p=openembedded.git

merge of 330dd41d9c920bd7109ac7473efd170ce60c9cf7
     and 748f1a9f0463ad5857b3efee6469b0f01c2c5d14
---

ef71654f8794259f649eecbedd5b37888e18aecc