[cheese/camerabin: 15/16] Merge remote branch 'origin/master' into camerabin

[Luciana Fujii Pontello <lufujii src gnome org>]

commit 0baef2fdb775a38b40e30c08c35b6a9593fc86c7
Merge: 3fa311f a7d2fe5
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Mon Feb 28 16:08:47 2011 -0300

    Merge remote branch 'origin/master' into camerabin

 Makefile.am                |    2 +
 autogen.sh                 |   10 +-
 configure.ac               |   50 ++-
 docs/reference/Makefile.am |    4 +-
 help/es/es.po              |  113 +++---
 libcheese/Makefile.am      |    2 +-
 po/af.po                   |  918 +++++++++++++++++++++++---------------------
 po/ar.po                   |  501 ++++++++++++------------
 po/ast.po                  |  918 +++++++++++++++++++++----------------------
 po/bn_IN.po                |  922 ++++++++++++++++++++++++--------------------
 po/fr.po                   |  697 +++++++++++----------------------
 po/pa.po                   |  107 +++---
 po/sr.po                   |  823 +++++++++++++++++-----------------------
 po/sr latin po             |  823 +++++++++++++++++-----------------------
 po/ug.po                   |  132 +++----
 po/uk.po                   |  873 ++++++++++++++++++++++--------------------
 src/cheese-window.vala     |    2 +-
 tests/Makefile.am          |    2 +-
 18 files changed, 3261 insertions(+), 3638 deletions(-)
---