[kaccessible/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 4ace3dba0a04061e420c32ed3f540ecb98684ff6
Merge: 21d9ba9 4362ed9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 08:54:37 2013 -0600

    Merge branch 'f18' into f17

---