From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 15 Feb 2007 06:21:02 +0000 (+0000)
Subject: merge of '1c7464901fc8ab3cb0e3ade6fdf445011603f0c4'
X-Git-Tag: Release-2010-05/1~9230^2~26^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e32c67afc50d7b9eafa15052f91fbc80890049;p=openembedded.git

Merge ... '1c7464901fc8ab3cb0e3ade6fdf445011603f0c4'
     and '5696d93cf7ba3449e090b00b16a4acc06e5377f6'
---

e1e32c67afc50d7b9eafa15052f91fbc80890049