From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 12 Mar 2007 17:17:21 +0000 (+0000)
Subject: merge of '934474afbdfdccb4dcb3386a4a6534ee50be8048'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~17^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f37d1149462c5cdc1ec85c9759a8027378f72cf4;p=openembedded.git

Merge ... '934474afbdfdccb4dcb3386a4a6534ee50be8048'
     and 'e21a13a5c2839e6b4dca88381311f3d1610fb8b8'
---

f37d1149462c5cdc1ec85c9759a8027378f72cf4