From: Koen Kooi <koen@openembedded.org>
Date: Sat, 29 Jul 2006 18:01:31 +0000 (+0000)
Subject: merge of '04f4f8d195ec1a23e53f2158cf15535337100d4f'
X-Git-Tag: Release-2010-05/1~9453^2~1052^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8774bdc398d97ded23d48614393b03cbd7af376;p=openembedded.git

Merge ... '04f4f8d195ec1a23e53f2158cf15535337100d4f'
     and 'a2037f5a81477506111846d9e8e8c70baee9a86a'
---

a8774bdc398d97ded23d48614393b03cbd7af376