Merge branch 'evk1100-prep'
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 23 Mar 2009 09:22:47 +0000 (10:22 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 23 Mar 2009 09:22:47 +0000 (10:22 +0100)

Trivial merge