From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 2 Sep 2006 11:26:17 +0000 (+0000)
Subject: merge of '77d1168447e90e85323f9ec845e69ae66dfafff0'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~83
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c895f45a44309ef8f29497eb78d284e9926d59a;p=openembedded.git

Merge ... '77d1168447e90e85323f9ec845e69ae66dfafff0'
     and 'ca845f15a06256056c6a92786915915d92d47d70'
---

9c895f45a44309ef8f29497eb78d284e9926d59a