From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Dec 2007 10:00:18 +0000 (+0000)
Subject: merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
X-Git-Tag: Release-2010-05/1~8180^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8beb70740dbd64d2138df8a07aafc24719cb50a6;p=openembedded.git

Merge ... '576d7c6e5dbff47f56003806561fdc43a07c6f50'
     and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
---

8beb70740dbd64d2138df8a07aafc24719cb50a6