[cheese/libcheese: 20/20] Merge branch 'master' into libcheese

[Luciana Fujii Pontello <lufujii src gnome org>]

commit b5b227127ca67df4e9d275c48a20afb3b13c1433
Merge: c8346bd af1d77f
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Thu Feb 17 18:21:10 2011 -0200

    Merge branch 'master' into libcheese
    
    Conflicts:
    	configure.ac
    	libcheese/Makefile.am
    	src/Makefile.am
    	tests/Makefile.am
    	tests/cheese-test-camera.c

 NEWS                       |   58 +++
 configure.ac               |   16 +-
 libcheese/Makefile.am      |   12 +-
 po/af.po                   |  918 +++++++++++++++++++++++---------------------
 po/ar.po                   |  501 ++++++++++++------------
 po/ast.po                  |  918 +++++++++++++++++++++-----------------------
 po/pa.po                   |  107 +++---
 po/sr.po                   |  823 +++++++++++++++++-----------------------
 po/sr latin po             |  823 +++++++++++++++++-----------------------
 po/ug.po                   |  132 +++----
 src/Makefile.am            |    4 +-
 src/cheese-window.vala     |    2 +-
 tests/Makefile.am          |   10 +-
 tests/cheese-test-camera.c |    3 +-
 14 files changed, 2074 insertions(+), 2253 deletions(-)
---
diff --cc libcheese/Makefile.am
index e4e49ce,1ada5fc..3d1dccf
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@@ -64,7 -64,10 +64,11 @@@ cheese_HEADERS = cheese-widget.h cheese
  
  libcheese_la_LIBADD = \
  	$(CHEESE_LIBS)
 +
+ libcheese_la_LDFLAGS = \
+ 	-version-info $(LIBCHEESE_LT_VERSION) \
+ 	$(AM_LDFLAGS)
+ 
  libcheese_gtk_la_LIBADD = \
  	libcheese.la \
  	$(CHEESE_LIBS) \