From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Oct 2008 11:55:02 +0000 (+0000)
Subject: merge of '4814b69151af2e49760bb9a3837c26ca674a7636'
X-Git-Tag: Release-2010-05/1~5819
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fed50a85dd97e56cf25576963739a97fb714dac;p=openembedded.git

Merge ... '4814b69151af2e49760bb9a3837c26ca674a7636'
     and '6d598225ef381f53c7c567f433cb8223d13f098e'
---

1fed50a85dd97e56cf25576963739a97fb714dac