From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sat, 1 Dec 2007 12:28:00 +0000 (+0000)
Subject: merge of 'b67fa447ea540c7174493e27cff5886f3f4ee90d'
X-Git-Tag: Release-2010-05/1~8248
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c721fb8d1c2511c72d8269b97c3cd044062cff;p=openembedded.git

Merge ... 'b67fa447ea540c7174493e27cff5886f3f4ee90d'
     and 'f22535c96dd5d39ae39d98a069d0f7fa5ebb4ace'
---

d1c721fb8d1c2511c72d8269b97c3cd044062cff