From: Philip Balister <philip@balister.org>
Date: Mon, 4 Aug 2008 12:28:04 +0000 (+0000)
Subject: merge of 'b7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed'
X-Git-Tag: Release-2010-05/1~6365^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a43a2dac05751b784d8bcc50a1fc91527bf511cc;p=openembedded.git

Merge ... 'b7175a8d7fdb02e01e375f3df1f6ab39e8ef01ed'
     and 'd1d0e66906b855684896804e34694a07d4958fe4'
---

a43a2dac05751b784d8bcc50a1fc91527bf511cc