From: Jamie Lenehan <lenehan@twibble.org>
Date: Fri, 26 May 2006 08:31:51 +0000 (+0000)
Subject: merge of 3395fc22cc5fd1e9a7862619eb6834ffcc6860cf
X-Git-Tag: Release-2010-05/1~9453^2~1617^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc01153a70f73eff6c272ae705b1a6a0192055b4;p=openembedded.git

merge of 3395fc22cc5fd1e9a7862619eb6834ffcc6860cf
     and 5784b72cf5dcca71eb0811f427acc0b4748ff43a
---

fc01153a70f73eff6c272ae705b1a6a0192055b4