From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 23:02:09 +0000 (+0000)
Subject: merge of 0ee8224b8b54771764675f2d2fb9f0b0c5de3b0e
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fb29ddf022f300211dfe6eade5d3c44d5baf533;p=openembedded.git

merge of 0ee8224b8b54771764675f2d2fb9f0b0c5de3b0e
     and b44eadcf7c10c71ba85ff83fbcd95d9ee3d3852b
---

8fb29ddf022f300211dfe6eade5d3c44d5baf533