[pidgin-musictracker/f13/master: 3/3] Merge branch 'master' into f13

[Jan Klepek]

commit eec1abf6b51614cebdc2ac6e0fc0621e5b8346c8
Merge: f24645f 8fbc1e3
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jan 8 16:23:56 2011 +0100

    Merge branch 'master' into f13

 pidgin-musictracker.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---