From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 22:25:17 +0000 (+0000)
Subject: merge of 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7
X-Git-Tag: Release-2010-05/1~9453^2~2387
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e545fa99d42e8705114ea6a673bd7a688ed6976;p=openembedded.git

merge of 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7
     and eee7e0d8ba89227d29beba3bc804f5340553c590
---

2e545fa99d42e8705114ea6a673bd7a688ed6976