[folks/next: 7/14] Merge remote-tracking branch 'origin/master' into next

[Simon McVittie <smcv src gnome org>]

commit 51c0687d93124982672a897f91b4b403b7c0f1a6
Merge: 375ccf9 dda8b6b
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed Apr 2 13:46:49 2014 +0100

    Merge remote-tracking branch 'origin/master' into next

 NEWS                         |    1 +
 configure.ac                 |    5 +-
 po/eu.po                     |  336 +++++++++++++++++++++++++++++-------------
 tests/lib/eds/test-case.vala |   36 +++++
 tests/lib/gtestdbus.c        |    6 +-
 tests/lib/test-case.vala     |   13 ++
 6 files changed, 295 insertions(+), 102 deletions(-)
---