From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 13:16:36 +0000 (+0000)
Subject: merge of 178beef16531b378ceadfaf06c189bf2d0cefe6b
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39de7785ee49751de148f8f8db2fb916968e9d29;p=openembedded.git

merge of 178beef16531b378ceadfaf06c189bf2d0cefe6b
     and e469bf244bad64c70f8175ad971b2d9a83365bec
---

39de7785ee49751de148f8f8db2fb916968e9d29