From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 21 Jan 2006 01:00:54 +0000 (+0000)
Subject: merge of 3f5dd0e7c459f413d83327c79e33c0301319dfa7
X-Git-Tag: Release-2010-05/1~9453^2~2607
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2d878d8a367479e612edda7ab31f3acd9fa11c;p=openembedded.git

merge of 3f5dd0e7c459f413d83327c79e33c0301319dfa7
     and b40740dd28cbde949223caa99ba81c79cbcae4c0
---

ed2d878d8a367479e612edda7ab31f3acd9fa11c