From: Philip Balister <philip@balister.org>
Date: Thu, 23 Aug 2007 14:06:09 +0000 (+0000)
Subject: merge of '045e56420da1d629481fa1a4c311ddb81cfd68d8'
X-Git-Tag: Release-2010-05/1~8811^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b486be9688c105f666ba4f85907cf02c04d6fba6;p=openembedded.git

Merge ... '045e56420da1d629481fa1a4c311ddb81cfd68d8'
     and 'b7def8e05c706107b7e68312f5e8ca17c4bdda6b'
---

b486be9688c105f666ba4f85907cf02c04d6fba6