From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 30 Oct 2005 02:16:14 +0000 (+0000)
Subject: merge of a2b0044ddbc5e9879532d74eecb9262016190544
X-Git-Tag: Release-2010-05/1~9453^2~3168
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=999c5127d107e0d9a76a5383b59da8c35e3fd882;p=openembedded.git

merge of a2b0044ddbc5e9879532d74eecb9262016190544
     and fe983f69120d3f09263cea771643b29b9a70785f
---

999c5127d107e0d9a76a5383b59da8c35e3fd882