From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 6 Oct 2007 22:08:47 +0000 (+0000)
Subject: merge of 'aac972a11d5683b639123784bea6534e132ad36d'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~139^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32414dbf90932f59d745eabd64a113d941afaa35;p=openembedded.git

Merge ... 'aac972a11d5683b639123784bea6534e132ad36d'
     and 'd714000fc8a6b75093a93f01782724b65d31eac1'
---

32414dbf90932f59d745eabd64a113d941afaa35