Merge tag 'upstream/3.14'
authorBdale Garbee <bdale@gag.com>
Fri, 29 Jun 2012 17:02:57 +0000 (11:02 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 29 Jun 2012 17:02:57 +0000 (11:02 -0600)
Upstream version 3.14


Trivial merge