Merge branch 'sni'
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 19 Oct 2010 06:42:47 +0000 (08:42 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 19 Oct 2010 06:42:47 +0000 (08:42 +0200)

Trivial merge