From: Bdale Garbee <bdale@gag.com>
Date: Tue, 23 Mar 2010 01:43:02 +0000 (-0600)
Subject: Merge commit '0b45c3af0d7947a3b38aeffea3e0eeac4f59d46a' into upstream
X-Git-Tag: upstream/1.1.0~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=f884f3d14d0985946b70695011cecb95cde12030;p=debian%2Fopenrocket

Merge commit '0b45c3af0d7947a3b38aeffea3e0eeac4f59d46a' into upstream
---

f884f3d14d0985946b70695011cecb95cde12030