From: Holger Freyther <zecke@selfish.org>
Date: Sun, 20 Aug 2006 09:38:10 +0000 (+0000)
Subject: merge of 'ed2d98bad995f47d5d9407c6f6042a4a0a16e4e8'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~29^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64b5be90302487a5ada3dfb300baddb2b1ff7524;p=openembedded.git

Merge ... 'ed2d98bad995f47d5d9407c6f6042a4a0a16e4e8'
     and 'f79e480392084bdbae07670461327da526458d3c'
---

64b5be90302487a5ada3dfb300baddb2b1ff7524