From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 28 Aug 2005 15:38:22 +0000 (+0000)
Subject: merge of 678605ef4af7fd23d048b55eb08df1ce8f4d3075
X-Git-Tag: Release-2010-05/1~9453^2~3763
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b59d9fe16be921107063d72a62a8111a9ecf7a58;p=openembedded.git

merge of 678605ef4af7fd23d048b55eb08df1ce8f4d3075
     and c261104f5142fb845f7ca1428c63d50c9c16dc92
---

b59d9fe16be921107063d72a62a8111a9ecf7a58