From: Jan Lübbe <jluebbe@debian.org>
Date: Thu, 29 Nov 2007 18:48:52 +0000 (+0000)
Subject: merge of '5bee5fc529fd2691fe3b0a867bbb28edcd59b01d'
X-Git-Tag: Release-2010-05/1~8252^2~5^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d242abb918f10cbe2b51390c35fa311e9083f542;p=openembedded.git

Merge ... '5bee5fc529fd2691fe3b0a867bbb28edcd59b01d'
     and '805d2f01c6463550c4d0dd1f943fc6f32ae13613'
---

d242abb918f10cbe2b51390c35fa311e9083f542