Merge tag 'sisu_3.2.1' into debian/sid
authorRalph Amissah <ralph@amissah.com>
Wed, 21 Mar 2012 23:59:05 +0000 (19:59 -0400)
committerRalph Amissah <ralph@amissah.com>
Wed, 21 Mar 2012 23:59:05 +0000 (19:59 -0400)

Trivial merge