Merge branch 'stable'

This commit is contained in:
Lars Hjemli
2008-12-30 12:29:50 +01:00