From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 2 Sep 2006 12:16:59 +0000 (+0000)
Subject: merge of '4ce409402d3a4d6242c33a93272d0721659ad13f'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~79
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d51b7ba86e3f532d70a37eef04d16014a451b3;p=openembedded.git

Merge ... '4ce409402d3a4d6242c33a93272d0721659ad13f'
     and 'b390e39e15fdf0dd583d371f2d99f56f01cc9794'
---

70d51b7ba86e3f532d70a37eef04d16014a451b3