From: Cliff Brake <cbrake@bec-systems.com>
Date: Fri, 12 Oct 2007 12:54:06 +0000 (+0000)
Subject: merge of '7c2dfd8725acfc6de0286a17d58cccbfa6c141f8'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~79^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8baf39c3f07d216960ecf6320cce022cc37a802b;p=openembedded.git

Merge ... '7c2dfd8725acfc6de0286a17d58cccbfa6c141f8'
     and 'a06a3079e29738b3d834a584143671d46904548d'
---

8baf39c3f07d216960ecf6320cce022cc37a802b