Merge branch 'bug-transparent' of git://git.rogdham.net/cavote
authorJulien Rabier <taziden@flexiden.org>
Thu, 30 Aug 2012 18:04:09 +0000 (20:04 +0200)
committerJulien Rabier <taziden@flexiden.org>
Thu, 30 Aug 2012 18:04:09 +0000 (20:04 +0200)

Trivial merge