Merge branch 'master' into add-q2d
authorAlan D. Brunelle <Alan.Brunelle@hp.com>
Thu, 6 Dec 2007 14:00:47 +0000 (09:00 -0500)
committerAlan D. Brunelle <Alan.Brunelle@hp.com>
Thu, 6 Dec 2007 14:00:47 +0000 (09:00 -0500)

Trivial merge