From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 6 Feb 2006 00:46:35 +0000 (+0000)
Subject: merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2~2^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b188ea2600bce6ed35559b21677bd8b7223f5a8;p=openembedded.git

merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
     and 59438d13db19ded8e22646fb8cddf849804f3a90
---

9b188ea2600bce6ed35559b21677bd8b7223f5a8