commit 15a509b073a0a1a86d4557c54faaa22078fc3294 Merge: 1350a40 490c0ae Author: Alexander Kurtakov <akurtako at redhat.com> Date: Fri Sep 24 21:38:38 2010 +0300 Merge branch 'master' of ssh://pkgs.fedoraproject.org/xjavadoc Conflicts: xjavadoc.spec ---