From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 29 Dec 2006 21:55:01 +0000 (+0000)
Subject: merge of 71838e03ecc147470b6b605de0819927c7cebc0c
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=014b1284f716ede8d819d06c7313908344c88473;p=openembedded.git

merge of 71838e03ecc147470b6b605de0819927c7cebc0c
     and a15520bc8320348a683cfd241267511a39da4291
---

014b1284f716ede8d819d06c7313908344c88473