From: Bdale Garbee <bdale@gag.com>
Date: Mon, 26 Dec 2011 02:07:44 +0000 (-0700)
Subject: Merge branch 'branch-1.0' of ssh://git.gag.com/scm/git/fw/altos into branch-1.0
X-Git-Tag: 1.0.3
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=241919b1de75760d19a9f96195f2e547fd81aea0;p=fw%2Faltos

Merge branch 'branch-1.0' of ssh://git.gag.com/scm/git/fw/altos into branch-1.0
---

f993afc4860f105b719682f49a100779d47c02e0