From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 13 Dec 2006 10:17:31 +0000 (+0000)
Subject: merge of 03ee5c18fcd59d8dab308dd8b281cf7dfd3a96b7
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c6802758691f5f1aec7e72a315799c0708abdce;p=openembedded.git

merge of 03ee5c18fcd59d8dab308dd8b281cf7dfd3a96b7
     and 6f4e57d60a95fb5db9330f41b66258937b0126e9
---

1c6802758691f5f1aec7e72a315799c0708abdce