From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 23 Dec 2006 19:02:16 +0000 (+0000)
Subject: merge of aca32242c3aeda1deec71cb3492a56279b957c6c
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f8917326166031edb7cc9fcdf482af6531a245e;p=openembedded.git

merge of aca32242c3aeda1deec71cb3492a56279b957c6c
     and d67f8bd3fed7755a1d32f2af73c8b9150f5836e2
---

7f8917326166031edb7cc9fcdf482af6531a245e