From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 19 Aug 2006 17:25:57 +0000 (+0000)
Subject: merge of 'cb591f5b883733fa2368b93267c8b93a727fa2c7'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74b7777259487e83caba871c7b77cf43ac12fa82;p=openembedded.git

Merge ... 'cb591f5b883733fa2368b93267c8b93a727fa2c7'
     and 'f9b2fe26aea3315e537bd3dccf2d89fb990f3b5d'
---

74b7777259487e83caba871c7b77cf43ac12fa82