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

[Luciana Fujii Pontello <lufujii src gnome org>]

commit 61e96092f9416097bd89d875570a49337eed4910
Merge: a9bf39f 5db9637
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Mon Jan 31 18:58:27 2011 -0200

    Merge branch 'master' into libcheese
    
    Conflicts:
    	libcheese/cheese-camera.c

 docs/reference/Makefile.am        |    1 -
 libcheese/Makefile.am             |    2 -
 libcheese/cheese-avatar-chooser.c |   49 +---
 libcheese/cheese-countdown.c      |  691 -------------------------------------
 libcheese/cheese-countdown.h      |   57 ---
 po/POTFILES.in                    |    1 -
 src/vapi/cheese-common.vapi       |    2 -
 tests/cheese-test-chooser.c       |    3 +-
 8 files changed, 6 insertions(+), 800 deletions(-)
---