From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 14 May 2007 11:05:55 +0000 (+0000)
Subject: merge of '3010c8d9b229ee097f809082df8fa23835ce261f'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bfd0edf896c59eff20073addae968457df1b3a9;p=openembedded.git

Merge ... '3010c8d9b229ee097f809082df8fa23835ce261f'
     and 'e173605c3b1c2fe06e8a3d500f54d0d06a15896b'
---

1bfd0edf896c59eff20073addae968457df1b3a9