Merge remote branch 'upstream/master'
authorAdam Piątyszek <ediap@users.sourceforge.net>
Thu, 17 Sep 2009 20:08:42 +0000 (22:08 +0200)
committerAdam Piątyszek <ediap@users.sourceforge.net>
Thu, 17 Sep 2009 20:08:42 +0000 (22:08 +0200)

Trivial merge