commit 716a90671fbf1ad007592d0d2a72e867fc564430 Merge: f1fc2dd 02b2500 Author: Jeffrey C. Ollie <jeff at ocjtech.us> Date: Mon Jul 25 08:37:30 2011 -0500 Merge remote-tracking branch 'origin/master' into v10devel Conflicts: asterisk.spec ---