[trackballs/f13/master: 4/4] Merge remote branch 'origin/master' into f13/master

[Hans de Goede]

commit e10474c4b49cd5a63f301f9d7c6bfa74bc19b5f6
Merge: 2455b5e 803ca5b
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Jan 25 23:21:00 2011 +0100

    Merge remote branch 'origin/master' into f13/master

 trackballs-1.1.4-destdir.patch  |   21 ---------------------
 trackballs-1.1.4-rh667236.patch |   12 ++++++++++++
 trackballs.spec                 |   10 +++++++++-
 3 files changed, 21 insertions(+), 22 deletions(-)
---