[niepce: 5/12] Merge branch 'master' into import-dialog

[Hubert Figuière <hub src gnome org>]

commit a04a976917b1953f5185a3e3074cfbb8e63f9bb9
Merge: 817ab94 f46594d
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Jun 5 23:24:01 2015 -0400

    Merge branch 'master' into import-dialog
    
    To pickup some bustage fixes.

 src/fwk/toolkit/application.cpp     |    7 +++++++
 src/niepce/ui/niepceapplication.cpp |    5 +++--
 src/niepce/ui/thumbstripview.cpp    |    4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)
---