[emerillon-plugins: 4/4] Merge commit 'refs/merge-requests/1' of git://gitorious.org/emerillion/emerillon-plugins

[Łukasz Jernaś <ljernas src gnome org>]

commit f5851820a61032d90149f63f19b34f3b2c3107ed
Merge: 3261913 98aaebd
Author: Å?ukasz JernaÅ? <deejay1 srem org>
Date:   Sat May 8 18:52:25 2010 +0200

    Merge commit 'refs/merge-requests/1' of git://gitorious.org/emerillion/emerillon-plugins

 configure.ac                                       |   21 ++++++-
 plugins/sample-vala/Makefile.am                    |   56 ++++++++++++++++
 plugins/sample-vala/sample-vala-plugin.vala        |   68 ++++++++++++++++++++
 .../sample-vala/sample-vala.emerillon-plugin.in    |    7 ++
 4 files changed, 151 insertions(+), 1 deletions(-)
---