From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 18 Nov 2006 06:59:31 +0000 (+0000)
Subject: merge of '098ecd6f9272018d813f8ffd6659f743b8aa0394'
X-Git-Tag: Release-2010-05/1~9453^2~434^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fa013a67614490729c3a4a514637ec54bf4430;p=openembedded.git

Merge ... '098ecd6f9272018d813f8ffd6659f743b8aa0394'
     and '3ef89846e91bf5f30231b6119392a9e1f03dfea0'
---

f9fa013a67614490729c3a4a514637ec54bf4430