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

merge of 10fda4dfb0a2f5767e4a9d988a15ebb4f4cbf79c
     and c49f43315981d8fb19ca487c3def795abc8299cf
---

4e1d8353b3caf7603b725f697cbd375ba51f583a