From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 10:58:28 +0000 (+0000)
Subject: merge of 7cf02eba7575b6840c1fb5d91671c51d7ce49303
X-Git-Tag: Release-2010-05/1~9453^2~1920
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba4813236cfa8e229ddae4af68bb12b7ef9c9822;p=openembedded.git

merge of 7cf02eba7575b6840c1fb5d91671c51d7ce49303
     and e6da98bac7d686d3e88211061aa2804f4f75c109
---

ba4813236cfa8e229ddae4af68bb12b7ef9c9822