From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Feb 2007 13:52:29 +0000 (+0000)
Subject: merge of '34e476df3adb31518eca1a4d01727fe9d5ebac77'
X-Git-Tag: Release-2010-05/1~9273^2~4^2~1^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa2431364c04d84fb502a0ebbe2f77559cb20e6d;p=openembedded.git

Merge ... '34e476df3adb31518eca1a4d01727fe9d5ebac77'
     and 'b30c0de0e6bb4763443fba8d9008bc092b0ad454'
---

aa2431364c04d84fb502a0ebbe2f77559cb20e6d