From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sun, 13 Aug 2006 18:32:20 +0000 (+0000)
Subject: merge of '42fa696a594e3a4b211f213594277acc96fef947'
X-Git-Tag: Release-2010-05/1~9453^2~957^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=179b81f5a05fc355e125d0eb64892e198d39c7ca;p=openembedded.git

Merge ... '42fa696a594e3a4b211f213594277acc96fef947'
     and '7a6ef70c33357e83223926dab560ae66d6f41c7c'
---

179b81f5a05fc355e125d0eb64892e198d39c7ca