Revision 1866643

Merge the r1863987 group from trunk:

 * r1863987, r1863990
   Fix format of Requires(.private) fields in pkg-config files
   Justification:
     Fixes format of .pc files and specifies correct include/link flags
   Votes:
     +1: jamessan, rhuijben, brane