merge of 4cabc1f4514de7d06d191258f499a56e52e61d7b
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 11 Aug 2005 20:40:30 +0000 (20:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 20:40:30 +0000 (20:40 +0000)
commit4482fb65c15c522245c9fed2ed92bc182fb2304c
tree014cf83ce781a1447685817e69a5ce1f1d5a4617
parent7c4772d193f1a499f51cbfb6e25055b016a68eb9
parent824645e1ba1492eee5019cc7f48adf6711fc9ef7
merge of 4cabc1f4514de7d06d191258f499a56e52e61d7b
     and 823a1ea1e6a9e49dbe87bcce981a7df8a03d518e