Merge commit '9f4c899c0d' into devel

This commit is contained in:
Trond Myklebust 2009-03-28 16:50:58 -04:00
commit d188262d60