From: John Bowler <jbowler@nslu2-linux.org>
Date: Thu, 11 Aug 2005 20:40:30 +0000 (+0000)
Subject: merge of 4cabc1f4514de7d06d191258f499a56e52e61d7b
X-Git-Tag: Release-2010-05/1~9453^2~3926
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4482fb65c15c522245c9fed2ed92bc182fb2304c;p=openembedded.git

merge of 4cabc1f4514de7d06d191258f499a56e52e61d7b
     and 823a1ea1e6a9e49dbe87bcce981a7df8a03d518e
---

4482fb65c15c522245c9fed2ed92bc182fb2304c