From: Philip Balister <philip@balister.org>
Date: Thu, 19 Oct 2006 11:13:32 +0000 (+0000)
Subject: merge of '4d2506a7328df70c3c1b58a19a5f52a6e6841a91'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~98
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=157fcb8d7c3d0c164aa81fd72b676c6620aa252e;p=openembedded.git

Merge ... '4d2506a7328df70c3c1b58a19a5f52a6e6841a91'
     and '95790f96b79f6c36ad3f1f583d73e9d450736479'
---

157fcb8d7c3d0c164aa81fd72b676c6620aa252e