From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 22 Dec 2006 18:17:16 +0000 (+0000)
Subject: merge of 0e47f1ec02c7c5b2942ab3c42effa12ef8977a20
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1df60836c768940759a5f0e4813038b103e972bc;p=openembedded.git

merge of 0e47f1ec02c7c5b2942ab3c42effa12ef8977a20
     and 3aa45e24e6598b1c8cab608c273fda4cc3c9c704
---

1df60836c768940759a5f0e4813038b103e972bc