[mousetrap/gnome3-wip: 39/240] Merge branch 'gnome3-wip' into ocfw_refactor

[Heidi Ellis <heidiellis src gnome org>]

commit 42cee13968b7f33fdc5149188ee85907ac553322
Merge: b1d968e 5475e8d
Author: Stoney Jackson <dr stoney gmail com>
Date:   Fri May 16 13:16:30 2014 -0400

    Merge branch 'gnome3-wip' into ocfw_refactor

 src/mousetrap/__init__.py         |    8 +++---
 src/mousetrap/ocvfw/__init__.py   |    8 +++---
 src/mousetrap/ocvfw/idm/finger.py |   51 ++++++++++++++++++++----------------
 3 files changed, 36 insertions(+), 31 deletions(-)
---