From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 30 Apr 2008 12:28:01 +0000 (+0000)
Subject: merge of '95cefda8965d9f34e429a5b0e01d5c392825e133'
X-Git-Tag: Release-2010-05/1~7079^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d0ef5690afbcb6a9ed3a9b65a059a8fd7828688;p=openembedded.git

Merge ... '95cefda8965d9f34e429a5b0e01d5c392825e133'
     and 'c8c6f8c33c61af0056076c21f8e84da83a85d8d8'
---

6d0ef5690afbcb6a9ed3a9b65a059a8fd7828688