From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 19:02:36 +0000 (+0000)
Subject: merge of 97d5d65aa62ae96288856a5b7cec4213224021e2
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00df27becc3d63bdaaef620775e0e669b3aae293;p=openembedded.git

merge of 97d5d65aa62ae96288856a5b7cec4213224021e2
     and dab75b0063f1ebcf6efa7a60b26654b30c65dd68
---

00df27becc3d63bdaaef620775e0e669b3aae293