From: Koen Kooi <koen@openembedded.org>
Date: Wed, 9 Aug 2006 13:11:18 +0000 (+0000)
Subject: merge of '14667242175a1d72fe6a6278ffb941a5c170c04f'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~12^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52882c747b8dbbc8db5bef86c95f9456cd422699;p=openembedded.git

Merge ... '14667242175a1d72fe6a6278ffb941a5c170c04f'
     and 'f09491a3dc7f40ea6081d29c8983a1cc97e84ad3'
---

52882c747b8dbbc8db5bef86c95f9456cd422699