From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 23 Dec 2006 23:06:02 +0000 (+0000)
Subject: merge of 6bcacc9371f97cfdd5bcf5507e1afc90ece8b3ad
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60b25762bdb11c03c8812c3521a07c3dada1141e;p=openembedded.git

merge of 6bcacc9371f97cfdd5bcf5507e1afc90ece8b3ad
     and 851a65b990ed186ba46dfa7fe340b495404ef429
---

60b25762bdb11c03c8812c3521a07c3dada1141e