From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Dec 2006 10:30:08 +0000 (+0000)
Subject: merge of '2ff0b12bedc3fd85cd0cbbce60e7586f5ae352b5'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74673897651b2b9250dffba5e8534977c53318d4;p=openembedded.git

Merge ... '2ff0b12bedc3fd85cd0cbbce60e7586f5ae352b5'
     and 'a1833fa642a839f32dc4d8e47347b73849b62b48'
---

74673897651b2b9250dffba5e8534977c53318d4