From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 21 Jan 2006 10:00:10 +0000 (+0000)
Subject: merge of 3e349431fd26f1c3eb3f6a3425f8c8d44167a5cb
X-Git-Tag: Release-2010-05/1~9453^2~2601
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c5e1feb8f9487429eb45884b2660ad860e8f67c;p=openembedded.git

merge of 3e349431fd26f1c3eb3f6a3425f8c8d44167a5cb
     and c1cd7b6a9ca9efdbea812fd0574ecb2bcdc1f8e4
---

8c5e1feb8f9487429eb45884b2660ad860e8f67c