From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Dec 2006 09:17:13 +0000 (+0000)
Subject: merge of 825f6cc895ba9ef144a4cea48421e9d184fabd24
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2cb4f0c4ce218c54b262d1b3cfe0aeab36a0ee;p=openembedded.git

merge of 825f6cc895ba9ef144a4cea48421e9d184fabd24
     and b85e59f79c3d254c7098d7f930f8b20abb357dd6
---

db2cb4f0c4ce218c54b262d1b3cfe0aeab36a0ee