[geoclue/f13/master: 6/6] fix merge

[Peter Robinson]

commit 7602650f2d26c2a6d08d0d616c3c2d90ca83a412
Merge: b36cf22 c5bf631
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 20 19:47:33 2010 +0000

    fix merge

 geoclue-NMCrash.patch |   31 +++++++++++++++++++++++++++++++
 geoclue.spec          |   12 ++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)
---