[BENTO-46] Update the centos-6.4 definition to use the common components.
[BENTO-46] Update the centos-6.4-i386 definition to use the common components.
Merge branch 'master' of github.com:opscode/bento
Fix merge conflict
Merge branch 'master' of github.com:juliandunn/bento