From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 1 Feb 2008 10:35:39 +0000 (+0000)
Subject: merge of 'bec88f8c787bf716caa2fed4d5076d31a98bba16'
X-Git-Tag: Release-2010-05/1~7771
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e41f85967bb4e37ec8de3798813d45335fc2fb24;p=openembedded.git

Merge ... 'bec88f8c787bf716caa2fed4d5076d31a98bba16'
     and 'f6b3170bc0db632a8c4bac63cc6de9b5655a653d'
---

e41f85967bb4e37ec8de3798813d45335fc2fb24