From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Dec 2006 15:04:00 +0000 (+0000)
Subject: merge of 635b821d34af0762478f5f451929137a56d1ed1c
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bae6516c2be264bbc04b6df1502bcc31886ffd67;p=openembedded.git

merge of 635b821d34af0762478f5f451929137a56d1ed1c
     and eda0057e3fe95d1fc551a5edd24a2fc998be43a3
---

bae6516c2be264bbc04b6df1502bcc31886ffd67