From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 11:02:20 +0000 (+0000)
Subject: merge of 277036108838a6ecc367f223a294475a7d9bfce0
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49892178e7ab34151007d79200837984e27be5d;p=openembedded.git

merge of 277036108838a6ecc367f223a294475a7d9bfce0
     and baf5ce07a766bfb5762bbce5e2b2e0fbbbef9155
---

c49892178e7ab34151007d79200837984e27be5d