From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 11 Sep 2006 23:52:18 +0000 (+0000)
Subject: merge of '08a9f8816233bc3d01e123af2e2d1cb16e33a5ca'
X-Git-Tag: Release-2010-05/1~9453^2~840^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7644e14b4c31c78ea0e244403345fccfc4fee208;p=openembedded.git

Merge ... '08a9f8816233bc3d01e123af2e2d1cb16e33a5ca'
     and '69dac44f2f89d51cf2907a847ea92aca14c6d2f7'
---

7644e14b4c31c78ea0e244403345fccfc4fee208