From: Koen Kooi <koen@openembedded.org>
Date: Sun, 5 Nov 2006 21:34:27 +0000 (+0000)
Subject: merge of '418c8f8721711c31d603902018e139a4834946ca'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~11^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bed0d20587c3e972199c8fb72c4e945d1168d4a;p=openembedded.git

Merge ... '418c8f8721711c31d603902018e139a4834946ca'
     and 'f4f260a7113d446b401c939f0bba03f887e2d69b'
---

3bed0d20587c3e972199c8fb72c4e945d1168d4a