Merge branch 'search'
commitc7c61deaf85fbd00dec452ec2eee437c487f0bc1
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 29 Feb 2008 13:54:18 +0000 (29 14:54 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 29 Feb 2008 13:54:18 +0000 (29 14:54 +0100)
treebfad1ee35777c9639a9d7e7dee53821df2c22ca1
parent5bfe2db7146bb95418614d954938c1724d83b184
parent4f7cb263f37d85e041b9d1b8b6493f30e4d77368
Merge branch 'search'

Conflicts:

ChangeLog
ChangeLog
org.el