OSDN Git Service

Merge branch 'for-upstream'
authorSimon Busch <morphis@gravedo.de>
Wed, 18 May 2011 18:34:35 +0000 (20:34 +0200)
committerSimon Busch <morphis@gravedo.de>
Wed, 18 May 2011 18:34:35 +0000 (20:34 +0200)

Trivial merge