From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 8 Jan 2006 01:15:22 +0000 (+0000)
Subject: merge of 46718e780d11f8632344968041941f51627340d0
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26a7fd402a881602259fa975f48e044b891e2749;p=openembedded.git

merge of 46718e780d11f8632344968041941f51627340d0
     and e7247df479a65586544743faa8ad71fd9c94be77
---

26a7fd402a881602259fa975f48e044b891e2749