From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Dec 2006 22:33:59 +0000 (+0000)
Subject: merge of 0cfaa91f1c4baed2bd0f736997c312adea35d3b8
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea6598ef4a5265b672310ef0b8b2b65a1df734e4;p=openembedded.git

merge of 0cfaa91f1c4baed2bd0f736997c312adea35d3b8
     and a90a976e24dcd66b537a5759c87fd5bcdec913db
---

ea6598ef4a5265b672310ef0b8b2b65a1df734e4