[libzeitgeist/f15: 8/8] Merge branch 'f17' into f15

[Renich Bon Ciric]

commit d39950ebff7c14d4fa678e9f70bdbf067146a75f
Merge: a33f879 7aec05f
Author: Renich Bon Ciric <renich at woralelandia.com>
Date:   Sat May 5 06:49:40 2012 -0500

    Merge branch 'f17' into f15

 .gitignore                          |    3 +
 libzeitgeist-disable-log-test.patch |   86 +++++++++++++++++++++++++++++++++++
 libzeitgeist.spec                   |   28 +++++++++---
 sources                             |    2 +-
 4 files changed, 111 insertions(+), 8 deletions(-)
---