From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 26 Dec 2006 07:02:02 +0000 (+0000)
Subject: merge of 315f8d949ff4e2e3c22ae6f04a8b05818b5a7403
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b18b3f6f217c086acfd05855d12d1e02ff6d13df;p=openembedded.git

merge of 315f8d949ff4e2e3c22ae6f04a8b05818b5a7403
     and 73083df25ef04912a19b6b56f5510de14442ab2d
---

b18b3f6f217c086acfd05855d12d1e02ff6d13df