Merge branch 'master' into ui2

Conflicts:
	kiki.hs

1 files changed, 4 insertions, 0 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index c2e5ead..ecb6021 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -708,6 +708,10 @@ parseSpec grip spec = (topspec,subspec)
                 | 'a' <= c && c <= 'f' = True
         ishex c = False
 
+     -- | Split a string into two at the first occurance of the given
+     -- delimiter.  If the delimeter does not occur, then the first
+     -- item of the returned pair is empty and the second item is the
+     -- input string.
      unprefix c spec = if null (snd p) then swap p else (fst p, tail (snd p))
       where p = break (==c) spec