[tracker/f16: 5/5] fix merge

[Peter Robinson]

commit 6f32d75331617eec997ad6e7d2b812e1416bc028
Merge: 0f03b64 ab21521
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 31 20:04:33 2011 +0000

    fix merge

 sources              |    2 +-
 tracker-fixdso.patch |   11 +++++++++++
 tracker.spec         |   12 +++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
---