From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 21:47:18 +0000 (+0000)
Subject: merge of 218a25224a00ea088b998fa5b64c604a674f4d0f
X-Git-Tag: Release-2010-05/1~9453^2~35^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=362f1e7a59f1cc84af6fa698ed022d86df308dca;p=openembedded.git

merge of 218a25224a00ea088b998fa5b64c604a674f4d0f
     and f80ec3fe1400feec5eddda8e5bb073be549dee55
---

362f1e7a59f1cc84af6fa698ed022d86df308dca