From: Bdale Garbee <bdale@gag.com>
Date: Sun, 16 Sep 2012 22:26:50 +0000 (-0600)
Subject: Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream
X-Git-Tag: upstream/12.09
X-Git-Url: https://git.gag.com/?p=debian%2Fopenrocket;a=commitdiff_plain;h=9349577cdfdff682b2aabd6daa24fdc3a7449b58

Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

Conflicts:
	android/libs/android-support-v4.jar
---

9349577cdfdff682b2aabd6daa24fdc3a7449b58