Merge branch 'rpm'
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 24 Oct 2007 01:46:10 +0000 (03:46 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 24 Oct 2007 01:46:10 +0000 (03:46 +0200)

Trivial merge