From: Philippe De Swert <philippedeswert@scarlet.be>
Date: Mon, 9 Apr 2007 22:46:10 +0000 (+0000)
Subject: merge of '38c8d04b074d2da5c68983c247ecf8522ed92c5c'
X-Git-Tag: Release-2010-05/1~8868^2~727
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26e1673343a2172a05864d60c1a89da12350f8d1;p=openembedded.git

Merge ... '38c8d04b074d2da5c68983c247ecf8522ed92c5c'
     and '8e4e5cd6606686e6371b5fa96e75e932ef9a097f'
---

26e1673343a2172a05864d60c1a89da12350f8d1