Merge r67713 and r67936 (Eric's parport driver) from trunk
authorColin Finck <colin@reactos.org>
Thu, 16 Jul 2015 15:12:50 +0000 (15:12 +0000)
committerColin Finck <colin@reactos.org>
Thu, 16 Jul 2015 15:12:50 +0000 (15:12 +0000)
svn path=/branches/colins-printing-for-freedom/; revision=68406


Trivial merge