From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jul 2007 13:30:00 +0000 (+0000)
Subject: merge of '96413855622926bccdbbfe20ecfe75876ce63806'
X-Git-Tag: Release-2010-05/1~8868^2~189^2~3^2~26^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b395d86fcfbb5a5025a938c611fbd4ff76c17c7;p=openembedded.git

Merge ... '96413855622926bccdbbfe20ecfe75876ce63806'
     and 'c506dccde8011523567684ad6f95b95ffc334a5a'
---

7b395d86fcfbb5a5025a938c611fbd4ff76c17c7