Merge /branches/3.2:r1378 to /trunk

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1521 4adac7df-926f-26a2-2b94-8c16560cd09d

src/common_video/jpeg/main/source/jpeg.gypi

@@ -49,6 +49,9 @@
               ],
             }],
           ],
+        }, {
+          # Need to add a directory normally exported by libjpeg.gyp.
+          'include_dirs': [ '<(DEPTH)/third_party/libjpeg', ],
         }],
       ],
       'sources': [