From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 14:16:09 +0000 (+0000)
Subject: merge of 12ecc3256c3cbdb928e09405dec7a0875d4e50f4
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74fc5b310d5b5360aaf0637c6092171e69a78b1;p=openembedded.git

merge of 12ecc3256c3cbdb928e09405dec7a0875d4e50f4
     and 6f7030a7620f1e037f99d9b547d729aab9386f33
---

f74fc5b310d5b5360aaf0637c6092171e69a78b1