From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 4 Apr 2006 21:31:48 +0000 (+0000)
Subject: merge of abf4a17f4b3d256e5b78049b819e1674eeef98d5
X-Git-Tag: Release-2010-05/1~9453^2~2098
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21d8fedc27a6b43eb838d120a2da8d18d0b9ce9c;p=openembedded.git

merge of abf4a17f4b3d256e5b78049b819e1674eeef98d5
     and e5a38d83b512c0a632ec3bd86a9e8066a38574ce
---

21d8fedc27a6b43eb838d120a2da8d18d0b9ce9c