Merge branch 'atmel'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 13:14:56 +0000 (08:14 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 13:14:56 +0000 (08:14 -0500)

Trivial merge