From: John Bowler <jbowler@nslu2-linux.org>
Date: Sat, 23 Jul 2005 00:13:26 +0000 (+0000)
Subject: merge of bc7ae097617d5f492c1f50dccf43a2f36147110a
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eaa7b8d5d19da6cdd23f4d62992ac2a1a8d0e68;p=openembedded.git

merge of bc7ae097617d5f492c1f50dccf43a2f36147110a
     and f46a71dcce351ec2fd3d4652afd3baa26dc1cc5b
---

4eaa7b8d5d19da6cdd23f4d62992ac2a1a8d0e68