[viewvc/f14/master: 2/2] Merge branch 'master' into f14

[bojan]

commit 3b4dfd4d4a8b7b66fd769293cf1aca527fef0cf5
Merge: 0ab5ccb 33a6c02
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed Mar 16 13:09:53 2011 +1100

    Merge branch 'master' into f14

 .gitignore  |    1 +
 sources     |    2 +-
 viewvc.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---