commit 17f7e69c50d8c14f001e2b4adae3c89513bc9287 Merge: e115393 629a8cd Author: Siddharth Sharma <h4xordood at remote-exploit.(none)> Date: Tue Jan 4 23:30:03 2011 +0530 Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/kpassgen into f14/master ---