From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 24 Sep 2006 19:20:39 +0000 (+0000)
Subject: merge of '39125d69491c9f3a5452771d45c4bacdfc07e67d'
X-Git-Tag: Release-2010-05/1~9453^2~677^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0a362fb94207c13670ff9cc25c18ef824f63dd1;p=openembedded.git

Merge ... '39125d69491c9f3a5452771d45c4bacdfc07e67d'
     and '4f6bdecad243ff8ec5ee4769bff913c985fad72b'
---

c0a362fb94207c13670ff9cc25c18ef824f63dd1