Merge remote-tracking branch 'upstream/master'
authorDavid Straw <strawd@hp>
Fri, 13 Jul 2012 20:20:31 +0000 (14:20 -0600)
committerDavid Straw <strawd@hp>
Fri, 13 Jul 2012 20:20:31 +0000 (14:20 -0600)

Trivial merge