From: Koen Kooi <koen@openembedded.org>
Date: Thu, 18 Sep 2008 08:08:13 +0000 (+0000)
Subject: merge of '20460ca5bc208d9dfe0693cc79f9684c01aef89d'
X-Git-Tag: Release-2010-05/1~6063^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4726077de2e910260443e159384f2eede3f10310;p=openembedded.git

Merge ... '20460ca5bc208d9dfe0693cc79f9684c01aef89d'
     and '47719692fbdea0a9908a2b8c86858fe92ce97e1e'
---

4726077de2e910260443e159384f2eede3f10310