[gnome-pilot/f16: 6/6] fix merge

[Peter Robinson]

commit bce7f874105ff7621788112257cd595e1b14a1dc
Merge: eb2b15d 9a0de4b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 11 13:35:21 2011 +0100

    fix merge

 gnome-pilot.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---