From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 16 Dec 2006 13:02:25 +0000 (+0000)
Subject: merge of 94a8f6547e9d39dcd4712e33608201293c57b693
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c6f6f4beec9847b371c05470a878d206967dbfe;p=openembedded.git

merge of 94a8f6547e9d39dcd4712e33608201293c57b693
     and a1ac08321d149b2fdf0a8556eee3e9606457d69c
---

1c6f6f4beec9847b371c05470a878d206967dbfe