From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 24 Mar 2008 14:53:44 +0000 (+0000)
Subject: merge of '18a835c49f98aebf12d1299f14d6e62e8358e6a4'
X-Git-Tag: Release-2010-05/1~7280^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20d8a68bbc98fc6697efe063b8df1bdca084e412;p=openembedded.git

Merge ... '18a835c49f98aebf12d1299f14d6e62e8358e6a4'
     and '224361c92f343abb72e0ab516a332f63dace3f78'
---

20d8a68bbc98fc6697efe063b8df1bdca084e412