Merge branch 'billboard'
authortanya <tanyshk@gmail.com>
Thu, 10 Jun 2010 06:04:09 +0000 (09:04 +0300)
committertanya <tanyshk@gmail.com>
Thu, 10 Jun 2010 06:04:09 +0000 (09:04 +0300)
commitc1df4ee32c9528de65084bda56c532e32a690eeb
treebdf3f394a9b19ade63eec192fadd8ca7b994a2ab
parent5d2bc6552b89451f018340a31f46b44f1b960f5e
parent323b66869bbe0e43c4ccf07442e1da200cfaba61
Merge branch 'billboard'

Conflicts:
applet/src/livewp-scene.c
applet/debian/control
applet/src/livewp-common.h
applet/src/livewp-home-widget.c
applet/src/livewp-scene.c