Merge branch 'master' into hyades
authorjorgormo <jorgormo@node001.(none)>
Mon, 30 Jun 2008 14:56:07 +0000 (16:56 +0200)
committerjorgormo <jorgormo@node001.(none)>
Mon, 30 Jun 2008 14:56:07 +0000 (16:56 +0200)

Trivial merge