From: Koen Kooi <koen@openembedded.org>
Date: Tue, 17 Oct 2006 11:18:41 +0000 (+0000)
Subject: merge of '015d8066795c710542be78b0d248e74face7af15'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~132^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e48ba7745f2f55c68f8cfdc6daba51dfb98d1c9;p=openembedded.git

Merge ... '015d8066795c710542be78b0d248e74face7af15'
     and 'c745578220f213ec22c9b7cc2d6a413b1c32f4e0'
---

9e48ba7745f2f55c68f8cfdc6daba51dfb98d1c9