From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 19 Jul 2005 22:29:02 +0000 (+0000)
Subject: merge of 3a43238b0a602039ba26a7418ed911eaee3d4748
X-Git-Tag: Release-2010-05/1~9453^2~4121
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70f1c204b65ebfc97628c76520c0e2c1aed19f40;p=openembedded.git

merge of 3a43238b0a602039ba26a7418ed911eaee3d4748
     and 76ec428e36a1ce1f16ed827eb407369786c2a706
---

70f1c204b65ebfc97628c76520c0e2c1aed19f40