From: Jamie Lenehan <lenehan@twibble.org>
Date: Sat, 27 May 2006 23:03:13 +0000 (+0000)
Subject: merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
X-Git-Tag: Release-2010-05/1~9453^2~1576^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1561250669e6936528f37596e6ccbbcb7b4206cc;p=openembedded.git

merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
     and faf532c4c96ee2f44be6339cdc67fc8f9be0d0ac
---

1561250669e6936528f37596e6ccbbcb7b4206cc