From: John Lee <john_lee@openmoko.org>
Date: Fri, 7 Mar 2008 12:40:47 +0000 (+0000)
Subject: merge of '211b2bf7086145ba83e7b54cebded9bb3025b075'
X-Git-Tag: Release-2010-05/1~7106^2^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b781aba534b1c5ba47a00fe9e2caaf8743536100;p=openembedded.git

Merge ... '211b2bf7086145ba83e7b54cebded9bb3025b075'
     and 'cb58be96e7128aa032b10e0b9d369ca6f59af487'
---

b781aba534b1c5ba47a00fe9e2caaf8743536100