Merge remote-tracking branch 'origin/0.10'
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 6 Apr 2012 12:52:12 +0000 (14:52 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 6 Apr 2012 12:52:12 +0000 (14:52 +0200)
commit4d744d7027aaf5f3115a6ecdd2a31a67b58daecc
tree6a06d08dbcee7db241cd97055292071c1194d496
parent72f951f6d7931c461f72dca69d90eb2b80b635da
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/h264parse/gsth264parse.c
gst/videoparsers/gsth264parse.c