From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 30 Jan 2006 23:31:55 +0000 (+0000)
Subject: merge of 0bbfeca4a5e914b371359c7f066b9731f637102a
X-Git-Tag: Release-2010-05/1~9453^2~2492
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdba45cea1cc5644c003b5598350563f0d690a7f;p=openembedded.git

merge of 0bbfeca4a5e914b371359c7f066b9731f637102a
     and cd257fc3be2c2b6a6d43881ec1ebc7fd3b1608ff
---

fdba45cea1cc5644c003b5598350563f0d690a7f