Merge branch 'evk1100-prep'

This commit is contained in:
Haavard Skinnemoen
2009-03-23 10:22:47 +01:00