commit 2a3fa6be38b157494b0f849a42a5d440fe2acb7a Merge: 6a66a62 80ac0bc Author: Jeffrey C. Ollie <jeff at ocjtech.us> Date: Mon Oct 17 16:34:33 2011 -0500 Merge branch 'f16' into el6 .gitignore | 2 ++ asterisk.spec | 29 +++++++++++++++++++++++++---- sources | 4 ++-- 3 files changed, 29 insertions(+), 6 deletions(-) ---