[neXtaw: 7/7] Merge remote branch 'origin/f12/master'

[Jerry James]

commit b4b9e4b5adf986269b31516723b9ee4b32273df5
Merge: b54abbe 18fa7bc
Author: Jerry James <jamesjer at localhost.localdomain>
Date:   Mon Aug 2 12:57:27 2010 -0600

    Merge remote branch 'origin/f12/master'

---