From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 19:46:44 +0000 (+0000)
Subject: merge of 65ff3c29b2d11109da1f8a71bdfcc1dfe9819b3d
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58b9f0b800a7862e2e58692fa8e249fa1dcbc81;p=openembedded.git

merge of 65ff3c29b2d11109da1f8a71bdfcc1dfe9819b3d
     and 9e50203982dff971247712f595aa258181bfff0f
---

f58b9f0b800a7862e2e58692fa8e249fa1dcbc81