From: Philip Balister <philip@balister.org>
Date: Tue, 2 Oct 2007 17:04:47 +0000 (+0000)
Subject: merge of '1e1adf51dc9360eaaa91db46f1ad5ca664d7a0cc'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4994a19f0b6d20797d3e759ebc4fd3406add0b9d;p=openembedded.git

Merge ... '1e1adf51dc9360eaaa91db46f1ad5ca664d7a0cc'
     and 'a0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9'
---

4994a19f0b6d20797d3e759ebc4fd3406add0b9d