From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 12 Dec 2006 15:17:26 +0000 (+0000)
Subject: merge of 1e97274b2fce0be7f2b05bb936cceea97087b0b3
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^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2^2~1^2~1^2^2~1^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bdf737ddbd5255141d65adca72f9403071b485c;p=openembedded.git

merge of 1e97274b2fce0be7f2b05bb936cceea97087b0b3
     and 33e65cfac9987cd14f1dd1b418226c2e0fb266a2
---

7bdf737ddbd5255141d65adca72f9403071b485c