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

merge of bf957aad8fed0ec82ba06498cfb76ff6829daee8
     and d44dc9ee0efde08485ad2777d9b525e078d88acc
---

2d5a8c0d306780c7392832be236add1f3994b1ea