[gstreamer1-plugins-base/f18: 5/5] Merge branch 'f19' into f18

[Brian Pepple]

commit aae3e3a1ade1cc228c5ba51383b9fb19f1dfb8ac
Merge: f1c9118 264a725
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sat Apr 27 10:58:18 2013 -0400

    Merge branch 'f19' into f18

 .gitignore                   |    1 +
 gstreamer1-plugins-base.spec |   11 ++++++++---
 sources                      |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index deb7a5b,c3f21b1..619f87b
--- a/.gitignore
+++ b/.gitignore
@@@ -8,3 -8,4 +8,4 @@@
  /gst-plugins-base-1.0.4.tar.xz
  /gst-plugins-base-1.0.5.tar.xz
  /gst-plugins-base-1.0.6.tar.xz
 -/gst-plugins-base-1.0.7.tar.xz
++/gst-plugins-base-1.0.7.tar.xz