Merge branch 'devel'

This commit is contained in:
Trond Myklebust 2008-04-24 14:01:02 -04:00
commit 233607dbbc
43 changed files with 1583 additions and 896 deletions