Code

Merge branch 'ff/auth'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 25 Apr 2009 21:58:23 +0000 (23:58 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 25 Apr 2009 21:58:23 +0000 (23:58 +0200)

Trivial merge