From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Nov 2006 21:46:26 +0000 (+0000)
Subject: merge of '3019a41b13454b8c73c07731830e179cef6cf1a1'
X-Git-Tag: Release-2010-05/1~9453^2~498
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25eefa3fee344829c1201114cd8600da553293cf;p=openembedded.git

Merge ... '3019a41b13454b8c73c07731830e179cef6cf1a1'
     and 'fe5436e72a8ae2a8f3be6a00ae94615704cf38a1'
---

25eefa3fee344829c1201114cd8600da553293cf