From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 24 Nov 2012 02:19:42 +0000 (-0800)
Subject: merge master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d86b88d84491fa2400221eb029529bea16ee490;p=dak.git

merge master
---

5d86b88d84491fa2400221eb029529bea16ee490