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

merge of 79d9031e921eb2b64b0a614d28f2952b273cf3cc
     and 8e49054449c5f82e15664ab6be8b283a79666195
---

b7b756939a64a4424f1651fbb4e1b01be6b759ff