Merge branch 'add-P'
authorAlan D. Brunelle <alan.brunelle@hp.com>
Tue, 11 Nov 2008 18:51:33 +0000 (13:51 -0500)
committerAlan D. Brunelle <alan.brunelle@hp.com>
Tue, 11 Nov 2008 18:51:33 +0000 (13:51 -0500)

Trivial merge