From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 11 Jun 2008 16:18:53 +0000 (+0000)
Subject: merge of '305437fef3e07f06f422c525af6d258fe65bd133'
X-Git-Tag: Release-2010-05/1~6768^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e705387fcfdb7b76d9dd7d1a25c9a60bd65c8d0;p=openembedded.git

Merge ... '305437fef3e07f06f422c525af6d258fe65bd133'
     and '374794f574689cc1c361cad389b3b85f1ab2132d'
---

6e705387fcfdb7b76d9dd7d1a25c9a60bd65c8d0