From: Philip Balister <philip@balister.org>
Date: Sat, 6 Jan 2007 21:15:10 +0000 (+0000)
Subject: merge of '21538320b9bfd701fe44c49c42b440022e9f4002'
X-Git-Tag: Release-2010-05/1~9435^2~14^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7297a182f627caa9023220f2130e362387132f26;p=openembedded.git

Merge ... '21538320b9bfd701fe44c49c42b440022e9f4002'
     and 'd3e46612b65a41e045e2e9743893d7fa7d8b23c2'
---

7297a182f627caa9023220f2130e362387132f26