Merge branch 'upstream'
authorpini <pini@bou-fi.net>
Thu, 17 Sep 2009 21:10:10 +0000 (23:10 +0200)
committerpini <pini@bou-fi.net>
Thu, 17 Sep 2009 21:10:10 +0000 (23:10 +0200)

Trivial merge