From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Jul 2005 16:25:28 +0000 (+0000)
Subject: merge of 9ec15bcfc4d260277ec3a62af4079f3fccba496f
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75ebaa5853aae420c9c281c126aaa70c0e1190b4;p=openembedded.git

merge of 9ec15bcfc4d260277ec3a62af4079f3fccba496f
     and b1ad57ce7e9bdcbffb51efed051a46a0435d5999
---

75ebaa5853aae420c9c281c126aaa70c0e1190b4