From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 11:46:10 +0000 (+0000)
Subject: merge of 0aec702b25b2fc86eeb069514171974937129625
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf1c37bcc5e9687d040d696051d84ee09a9a92dc;p=openembedded.git

merge of 0aec702b25b2fc86eeb069514171974937129625
     and 55b5ccb5821ec4c7d05e3dd27ba81c62897d511a
---

bf1c37bcc5e9687d040d696051d84ee09a9a92dc