Merge commit 'upstream/master'
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 27 Jul 2008 11:54:08 +0000 (13:54 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 27 Jul 2008 11:54:08 +0000 (13:54 +0200)

Trivial merge