From: Bdale Garbee <bdale@gag.com>
Date: Tue, 27 Sep 2011 07:00:14 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.0
X-Git-Tag: 1.0.2~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ac7633630c1b04fdd761c16af7bd9377e76926c5

Merge branch 'master' into branch-1.0
---

ac7633630c1b04fdd761c16af7bd9377e76926c5