From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 08:04:57 +0000 (+0000)
Subject: merge of 7caf52c13ad07d23cad84c5570562fdd3fb0c581
X-Git-Tag: Release-2010-05/1~9453^2~2454
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a429aece809b4a8ad03298239307c812403cb21d;p=openembedded.git

merge of 7caf52c13ad07d23cad84c5570562fdd3fb0c581
     and c725906f0e3558baed0a3b474b1ce24d43dad211
---

a429aece809b4a8ad03298239307c812403cb21d