From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 11:47:15 +0000 (+0000)
Subject: merge of 828dfc1ed164f5a7dbc310e1f3836850ef4ccb34
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9820afeeaaec57418d9094286793ffcf06d32f5;p=openembedded.git

merge of 828dfc1ed164f5a7dbc310e1f3836850ef4ccb34
     and cfef3514561ff9ce852948e81d2ab88315d0481c
---

a9820afeeaaec57418d9094286793ffcf06d32f5