From: Jamie Lenehan <lenehan@twibble.org>
Date: Fri, 11 Aug 2006 03:48:57 +0000 (+0000)
Subject: merge of '0737af91de87534a67944bad4308b43b04d675db'
X-Git-Tag: Release-2010-05/1~9453^2~995
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f77f74b952150df05cb9dd541eebcbbcdfc1915f;p=openembedded.git

Merge ... '0737af91de87534a67944bad4308b43b04d675db'
     and 'a4130542b7ace1980eb68dfc893a72e142cbce80'
---

f77f74b952150df05cb9dd541eebcbbcdfc1915f