From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 22 Mar 2007 23:59:18 +0000 (+0000)
Subject: merge of '012918bd735cf9750bdb63d703299e3bd4bf2650'
X-Git-Tag: Release-2010-05/1~8868^2~1030
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eba840e6b8f471eb497a8b21fb64b8ca724648b4;p=openembedded.git

Merge ... '012918bd735cf9750bdb63d703299e3bd4bf2650'
     and '41b8e1c230e8499abea8431580a55e91ef4b1e43'
---

eba840e6b8f471eb497a8b21fb64b8ca724648b4