[mydns/el6/master: 4/4] Merge branch 'master' into el6

[Itamar Reis Peixoto]

commit d83106a7472009212b517364d06121c5e101d9a4
Merge: b365345 c28a672
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Fri Dec 24 22:14:22 2010 -0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 mydns-start-after-mysql.patch |   20 --------------------
 mydns.spec                    |   11 ++++++-----
 sources                       |    2 +-
 3 files changed, 7 insertions(+), 26 deletions(-)
---