From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Sep 2006 07:31:13 +0000 (+0000)
Subject: merge of b596d0edd180623a7984d71329ef90b1fa69c162
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ee7a5e8ee32da8d0473c9ef0285dd5a0d6cd45;p=openembedded.git

merge of b596d0edd180623a7984d71329ef90b1fa69c162
     and ef4b6ce0c6a8b2158b800e027b43892c7b21f53b
---

20ee7a5e8ee32da8d0473c9ef0285dd5a0d6cd45