From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 19:17:45 +0000 (+0000)
Subject: merge of 2615762a802a943fb3b09e52d008cef73cf1c98c
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa966d618d3ffa86e1a1eb4b128a46f218e16e3f;p=openembedded.git

merge of 2615762a802a943fb3b09e52d008cef73cf1c98c
     and 55764cf9a3c5e4a1c7d275cf64d4a459218cd6f1
---

aa966d618d3ffa86e1a1eb4b128a46f218e16e3f