From: Michael Schutte <michi@uiae.at>
Date: Tue, 26 Jul 2011 10:02:03 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.0b6-1~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=9f23a429fb5222ccf1cce8f2bf8ae933f195f257;hp=-c;p=dactyl.git

Merge branch 'upstream'
---

9f23a429fb5222ccf1cce8f2bf8ae933f195f257