Merge branch 'upstream'
authorHaavard Skinnemoen <hskinnemoen@atmel.com>
Tue, 19 Jun 2007 13:40:01 +0000 (15:40 +0200)
committerHaavard Skinnemoen <hskinnemoen@atmel.com>
Tue, 19 Jun 2007 13:40:01 +0000 (15:40 +0200)

Trivial merge