From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sun, 13 Apr 2008 09:08:49 +0000 (+0000)
Subject: merge of '6fedd04121b05719430c13ec266e45683ed3b7bf'
X-Git-Tag: Release-2010-05/1~7207
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=013231b4a6d1eebf7c031f1624089728e13dfb73;p=openembedded.git

Merge ... '6fedd04121b05719430c13ec266e45683ed3b7bf'
     and 'cebd7c2df88a5188ea19393bb7e04a6d3c592956'
---

013231b4a6d1eebf7c031f1624089728e13dfb73