[sqliteman/f13/master: 4/4] Merge branch 'master' into f13

[terjeros]

commit 5b86ea78a30ae1f7a649ba5bc494dc8b2a2d8894
Merge: 69adc74 a3c5902
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sun Mar 20 13:57:30 2011 +0100

    Merge branch 'master' into f13

 sqliteman-1.2.2-desktop.patch |   11 +++++++++++
 sqliteman.spec                |   18 +++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
---