Merge branch 'fix-m'
authorAlan D. Brunelle <alan.brunelle@hp.com>
Tue, 11 Nov 2008 18:50:23 +0000 (13:50 -0500)
committerAlan D. Brunelle <alan.brunelle@hp.com>
Tue, 11 Nov 2008 18:50:23 +0000 (13:50 -0500)

Trivial merge