From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 02:02:01 +0000 (+0000)
Subject: merge of 3aabac1d8d2b7097feef35b9d8ec4b11af8498cb
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070dd681d54fd3160b99d44185b6426c60e8c3c4;p=openembedded.git

merge of 3aabac1d8d2b7097feef35b9d8ec4b11af8498cb
     and cd737e0251b1d5fce0fdc1dd08fd541ceb98ee31
---

070dd681d54fd3160b99d44185b6426c60e8c3c4