From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 30 Nov 2006 21:44:30 +0000 (+0000)
Subject: merge of '12edb579fffee6ffcbbed6a66d80c97b7705d000'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~64^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8325614d566291f61a1a9feea61cba07f070a754;p=openembedded.git

Merge ... '12edb579fffee6ffcbbed6a66d80c97b7705d000'
     and '48ac4b4de7e34d9fabc14d0f69415e4c1168e98b'
---

8325614d566291f61a1a9feea61cba07f070a754