From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Fri, 26 Dec 2008 13:31:14 +0000 (-0500)
Subject: Merge nyus:/storage/git/firearm
X-Git-Url: http://git.joshuawise.com/firearm.git/commitdiff_plain/960947a70a85ad40fe2569500806552d11f1e02d?hp=-c

Merge nyus:/storage/git/firearm
---

960947a70a85ad40fe2569500806552d11f1e02d