From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Dec 2006 19:17:15 +0000 (+0000)
Subject: merge of 361379aa261c9847d4ff3ffcf77bb2fa90c4b6bf
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~6^2^2^2^2~3^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eed447b7dd7428be69c26cf0f16e420d880dde17;p=openembedded.git

merge of 361379aa261c9847d4ff3ffcf77bb2fa90c4b6bf
     and e4fada900257177aa872c68e6c6da6fc12099662
---

eed447b7dd7428be69c26cf0f16e420d880dde17