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

merge of ac11f26f12bf43c4861e065ce644f72654c7cebd
     and f22de0090079fcc6d7b88e1321dcc693df185a54
---

a8720d83e79132669430e0e27fa0b86324a6f204