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

Merge ... 'acaec69cff5e01d75fc25fc008a3647d4276e23a'
     and 'fbdf8a106f5161fd714dd92d53cf8bd31fa6d8ea'
---

7d064c645c5b5daae85751a5a2f40a1a6c7acf88