From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 7 Aug 2005 18:45:40 +0000 (+0000)
Subject: merge of 8724fc9ddffaee5f1d11645b843841c381bff316
X-Git-Tag: Release-2010-05/1~9453^2~3939
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e141135f17e165f90df540cfee818c6e5047e5a8;p=openembedded.git

merge of 8724fc9ddffaee5f1d11645b843841c381bff316
     and 874bcd50b82c22dd088477970503fb656f93a7e0
---

e141135f17e165f90df540cfee818c6e5047e5a8