From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 23 Dec 2006 22:34:00 +0000 (+0000)
Subject: merge of 1102b39e42b1d6e10526d47d3c6263b7291b8974
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84bd21b5e2bc7f84ba21140c67df9b736e0473b6;p=openembedded.git

merge of 1102b39e42b1d6e10526d47d3c6263b7291b8974
     and ecb26e11cf493ca8d085fe023a6deeaf3dddfa27
---

84bd21b5e2bc7f84ba21140c67df9b736e0473b6