From: John Lee <john_lee@openmoko.org>
Date: Fri, 29 Feb 2008 13:13:00 +0000 (+0000)
Subject: merge of '20657a67dd3d46190016de2069fb77e48b12f0b9'
X-Git-Tag: Release-2010-05/1~7572^2~25^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92e199ae577377e41e92ddd4b0c58227502a04c5;p=openembedded.git

Merge ... '20657a67dd3d46190016de2069fb77e48b12f0b9'
     and '3d4d513f672a93f1547b3a1f5288ad83d6fc141b'
---

92e199ae577377e41e92ddd4b0c58227502a04c5