[octave-control/f16: 4/4] Merge remote-tracking branch 'origin/master' into f16

[sailer]

commit 1f4919a99031ba53fe2cb06cae9375dcf5e0b434
Merge: 87b0c40 1d38693
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Wed Aug 24 18:14:04 2011 +0200

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	octave-control.spec

 .gitignore          |    1 +
 octave-control.spec |    8 ++++++--
 sources             |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---