From: Philip Balister <philip@balister.org>
Date: Fri, 13 Oct 2006 14:52:15 +0000 (+0000)
Subject: merge of '172e330b964d32daab793a9adb3cc9dc29f58af6'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~198
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e70d0a213b93f40a9486fbafd37d098b2a21ae8;p=openembedded.git

Merge ... '172e330b964d32daab793a9adb3cc9dc29f58af6'
     and 'b7fc885dd4f576de1825063502bd8ff8189fd4c0'
---

5e70d0a213b93f40a9486fbafd37d098b2a21ae8